From: ThomasV <thomasv@gitorious>
Date: Mon, 30 Jun 2014 16:12:39 +0000 (+0200)
Subject: try pyasn1-modules as well
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=f635c5110c95b216a087906526877c7e5cbb85e5

try pyasn1-modules as well
---

diff --git a/electrum b/electrum
index 8b004b3..146ef3a 100755
--- a/electrum
+++ b/electrum
@@ -95,7 +95,7 @@ def print_help(parser):
     parser.print_help()
     print_msg("Type 'electrum help <command>' to see the help for a specific command")
     print_msg("Type 'electrum --help' to see the list of options")
-    run_command(known_commands['help'])
+    #run_command(known_commands['help'])
     sys.exit(1)
 
 
diff --git a/lib/x509.py b/lib/x509.py
index e2021df..e9cc857 100644
--- a/lib/x509.py
+++ b/lib/x509.py
@@ -26,6 +26,11 @@ except ImportError:
     sys.exit("Error: pyasn1 does not seem to be installed. Try 'sudo pip install pyasn1'")
 
 try:
+    import pyasn1_modules
+except ImportError:
+    sys.exit("Error: pyasn1 does not seem to be installed. Try 'sudo pip install pyasn1-modules'")
+
+try:
     import tlslite
 except ImportError:
     sys.exit("Error: tlslite does not seem to be installed. Try 'sudo pip install tlslite'")