Merge pull request #7 from sovrin-foundation/rc-1.12.6.rc2

[RC2-1.12.6] Fix exception type in update_package_cache

Author: WadeBarnes

indy_node/__version__.json

@@ -1 +1 @@
-[1, 12, 6, "rc", "1"]
+[1, 12, 6, "rc", "2"]

indy_node/test/node_control_utils/test_node_control_util.py

@@ -180,7 +180,7 @@ def _run_shell_script(command, *args, **kwargs):
         commands.append(command)
 
         if run_shell_script_counter == 1:
-            raise ShellError(100, "apt update")
+            raise Exception("Command 'apt update' returned non-zero exit status")
 
         return ''
 
@@ -212,7 +212,7 @@ def _run_shell_script(command, *args, **kwargs):
         commands.append(command)
 
         if run_shell_script_counter == 1:
-            raise ShellError(100, "apt update")
+            raise Exception("Command 'apt update' returned non-zero exit status")
 
         return ''
 

indy_node/utils/node_control_utils.py

@@ -361,7 +361,7 @@ def update_package_cache(cls):
         cmd = compose_cmd(['apt', 'update'])
         try:
             cls.run_shell_script(cmd)
-        except ShellError as e:
+        except Exception as e:
             # Currently two issues can stop this from working.
             # 1) The Sovrin Repo key needs to be updated
             #    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88