[backup-zfs] Use gpg2 (no particular reason)

[tools.git] / backup-zfs

diff --git a/backup-zfs b/backup-zfs
index 7ac2f39ee2851b06103b771c450f18f5f180a3fa..49c16566c2502cfc45dadc62a523a5c83492f3ee 100755 (executable)
--- a/backup-zfs
+++ b/backup-zfs
@@ -93,7 +93,7 @@ def sftp_send(dataset, reference=None):
     zfs = subprocess.Popen(zfscommand, stdout=subprocess.PIPE, bufsize=2*BUFFER)
     print(zfscommand)
 
-    gpgcommand = [ 'gpg', '--batch', '--compress-algo', 'ZLIB',
+    gpgcommand = [ 'gpg2', '--batch', '--compress-algo', 'ZLIB',
                    '--sign', '--encrypt', '--recipient', GPGUSER ]
     gpg = subprocess.Popen(gpgcommand, bufsize=2*BUFFER,
                                        stdout=subprocess.PIPE,
@@ -121,14 +121,16 @@ def sftp_send(dataset, reference=None):
                 done = done + len(junk)
 #                sys.stdout.write('#')
 #                sys.stdout.flush()
-                sys.stdout.write("\r%s %.3f GB      (%.3f MB/s)          " % (term['green'], (1.0 * done) / (1024 ** 3), (done / (1024 ** 2 *(time.time() - startt)))))
-                sys.stdout.flush()
+                if done != len(junk):
+                    sys.stdout.write("     \r%s %.3f GB      (%.3f MB/s)" % (term['green'], (1.0 * done) / (1024 ** 3), (done / (1024 ** 2 *(time.time() - startt)))))
+                    sys.stdout.flush()
                 remotefile.write(junk)
                 digest.update(junk)
                 junk = gpg.stdout.read(BUFFER)
 
             sys.stdout.write('\r')
-            print_colored(" %.3f GB DONE (%.3f MB/s)" % ((1.0 * done) / (1024 ** 3), (done / (1024 ** 2 *(time.time() - startt)))), 'green')
+            timedelta = time.time() - startt
+            print_colored(" %.3f GB DONE (%.3f MB/s) Total: %02d:%02d:%02d" % ((1.0 * done) / (1024 ** 3), (done / (1024 ** 2 *timedelta)), timedelta/3600, (timedelta/60)%60, timedelta%60), 'green')
             digestfile.write("%s  %s\n" % (digest.hexdigest(), filename))
 
 def syncronize(local_datasets, remote_datasets):