From 49b3ff8f83508d87f68d945f141bda04ef295167 2008-09-15 04:11:12
From: Brian Granger <ellisonbg@gmail.com>
Date: 2008-09-15 04:11:12
Subject: [PATCH] Fixes in MANIFEST.in and ipcontroller.py

* MANIFEST.in was including a few old files that don't exist 
  and was missing setupegg.py.  

* ipcontroller.py was giving a confusing exception message when
  pyOpenSSL was not present.

---

diff --git a/IPython/kernel/scripts/ipcontroller.py b/IPython/kernel/scripts/ipcontroller.py
index 26736c4..7441ec9 100644
--- a/IPython/kernel/scripts/ipcontroller.py
+++ b/IPython/kernel/scripts/ipcontroller.py
@@ -64,7 +64,10 @@ def make_tub(ip, port, secure, cert_file):
         if have_crypto:
             tub = Tub(certFile=cert_file)
         else:
-            raise SecurityError("OpenSSL is not available, so we can't run in secure mode, aborting")
+            raise SecurityError("""
+OpenSSL/pyOpenSSL is not available, so we can't run in secure mode.
+Try running without security using 'ipcontroller -xy'.
+""")
     else:
         tub = UnauthenticatedTub()
     
diff --git a/MANIFEST.in b/MANIFEST.in
index 5ed5052..880dfd5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
-include README_Windows.txt
-include win32_manual_post_install.py
 include ipython.py
 include setupbase.py
+include setupegg.py
 
 graft scripts