Check save/split names early via valid_save_name

[bup.git] / cmd / join-cmd.py

diff --git a/cmd/join-cmd.py b/cmd/join-cmd.py
index 347206da86f5fde814b86e7e2c3f07b7e50ad56d..33935d2ad85d997cc8ded8f7faebc22458b88ff9 100755 (executable)
--- a/cmd/join-cmd.py
+++ b/cmd/join-cmd.py
@@ -4,9 +4,11 @@ bup_python="$(dirname "$0")/bup-python" || exit $?
 exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
+
 import sys
+
 from bup import git, options, client
-from bup.helpers import *
+from bup.helpers import linereader, log
 
 
 optspec = """
@@ -41,7 +43,7 @@ for id in extra:
     try:
         for blob in cat(id):
             outfile.write(blob)
-    except KeyError, e:
+    except KeyError as e:
         outfile.flush()
         log('error: %s\n' % e)
         ret = 1