duplicity-team team mailing list archive

[Tobias Genannt <tobias.genannt@xxxxxxxxxxxxxx>]

Tobias Genannt has proposed merging lp:~tobias-genannt/duplicity/nocompress into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~tobias-genannt/duplicity/nocompress/+merge/86535
-- 
https://code.launchpad.net/~tobias-genannt/duplicity/nocompress/+merge/86535
Your team duplicity-team is requested to review the proposed merge of lp:~tobias-genannt/duplicity/nocompress into lp:duplicity.

=== modified file 'Changelog.GNU'
--- Changelog.GNU	2011-11-25 19:24:22 +0000
+++ Changelog.GNU	2011-12-21 11:00:33 +0000
@@ -1,3 +1,7 @@
+2011-12-21  Tobias Genannt  <tobias.genannt@xxxxxxxxxxxxx>
+
+	Added --no-compression to disable compression when no encryption is used.
+
 2011-11-25  Kenneth Loafman  <kenneth@xxxxxxxxxxx>
 
 	Not used.

=== modified file 'bin/duplicity'
--- bin/duplicity	2011-12-06 19:07:20 +0000
+++ bin/duplicity	2011-12-21 11:00:33 +0000
@@ -313,7 +313,7 @@
         """
         vol1_filename = file_naming.get(backup_type, 1,
                                         encrypted=globals.encryption,
-                                        gzipped=not globals.encryption)
+                                        gzipped=globals.compression)
         if vol1_filename != backup_set.volume_name_dict[1]:
             log.FatalError(_("Restarting backup, but current encryption "
                              "settings do not match original settings"),
@@ -369,7 +369,7 @@
         vol_num += 1
         dest_filename = file_naming.get(backup_type, vol_num,
                                         encrypted=globals.encryption,
-                                        gzipped=not globals.encryption)
+                                        gzipped=globals.compression)
         tdp = dup_temp.new_tempduppath(file_naming.parse(dest_filename))
 
         # write volume
@@ -467,7 +467,7 @@
     perm_sig_filename = file_naming.get(sig_type,
                                         gzipped=True)
     remote_sig_filename = file_naming.get(sig_type, encrypted=globals.encryption,
-                                          gzipped=not globals.encryption)
+                                          gzipped=globals.compression)
 
     fh = dup_temp.get_fileobj_duppath(globals.archive_dir,
                                       part_sig_filename,

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2011-11-25 17:47:57 +0000
+++ duplicity/commandline.py	2011-12-21 11:00:33 +0000
@@ -398,6 +398,9 @@
     # If set to false, then do not encrypt files on remote system
     parser.add_option("--no-encryption", action="store_false", dest="encryption")
 
+    # If set to false, then do not compress files on remote system
+    parser.add_option("--no-compression", action="store_false", dest="compression")
+
     # If set, print the statistics after every backup session
     parser.add_option("--no-print-statistics", action="store_false", dest="print_statistics")
 

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2011-11-24 01:35:20 +0000
+++ duplicity/globals.py	2011-12-21 11:00:33 +0000
@@ -128,6 +128,9 @@
 # If set to false, then do not encrypt files on remote system
 encryption = True
 
+# If set to false, then do not compress files on remote system
+compression = True
+
 # volume size. default 25M
 volsize = 25*1024*1024