diff --git a/electrum b/electrum index 8b004b3a3..146ef3a89 100755 --- a/electrum +++ b/electrum @@ -95,7 +95,7 @@ def print_help(parser): parser.print_help() print_msg("Type 'electrum help ' 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 e2021df47..e9cc85784 100644 --- a/lib/x509.py +++ b/lib/x509.py @@ -25,6 +25,11 @@ try: 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: