Merge remote-tracking branch 'origin/pr/8'

* origin/pr/8:
  Handle non existing qubessaltpatches in case where mgmt-salt-base-overrides is not needed anymore

qubessalt/__init__.py

@@ -39,7 +39,10 @@
 import salt.config
 import qubesadmin.exc
 import qubesadmin.vm
-import qubessaltpatches
+try:
+    import qubessaltpatches
+except ImportError:
+    pass
 
 FORMAT_LOG = '%(asctime)s %(message)s'
 LOGPATH = '/var/log/qubes'
@@ -228,7 +231,10 @@ def __init__(self, app, vms, command, max_concurrency=4, show_output=False,
         self._opts['file_client'] = 'local'
 
         # this do patch already imported salt modules
-        import qubessaltpatches
+        try:
+            import qubessaltpatches
+        except ImportError:
+            pass
 
     def collect_result(self, result_tuple):
         name, exit_code, result = result_tuple