Mercurial > repos > borgend / file diff

--- a/instance.py	Sun Jan 21 13:34:12 2018 +0000
+++ b/instance.py	Sun Jan 21 14:34:35 2018 +0000
@@ -43,9 +43,11 @@
 
         logger.info('Launching ' + str(cmd))
 
+        # Set passphrase if not, or set to empty if not known, so borg
+        # won't hang waiting for it, which seems to happen even if we
+        # close stdin.
         env=os.environ.copy()
-        if passphrase:
-            env['BORG_PASSPHRASE']=passphrase
+        env['BORG_PASSPHRASE']=passphrase or ''
 
         # Workaround: if launched is a standalone app created with py2app,
         # borg will fail unless Python environment is reset.
@@ -71,7 +73,7 @@
 
         try:
             return json.loads(line)
-        except:
+        except Exception as err:
             logger.warning('JSON parse failed on: "%s"' % line)
             return None