duplicity-team team mailing list archive

[Benoit Bertholon <benoit@xxxxxxxxxxxxxx>]

Benoit Bertholon has proposed merging lp:~benoit.bertholon/duplicity/duplicity into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #1666194 in Duplicity: "ProcessCommandLine function called twice  fail and arglist argument not used"
  https://bugs.launchpad.net/duplicity/+bug/1666194

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

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2017-02-11 20:46:45 +0000
+++ duplicity/commandline.py	2017-02-20 12:17:22 +0000
@@ -635,7 +635,7 @@
     parser.add_option("--backend-retry-delay", type="int", metavar=_("seconds"))
 
     # parse the options
-    (options, args) = parser.parse_args()
+    (options, args) = parser.parse_args(arglist)
 
     # Copy all arguments and their values to the globals module.  Don't copy
     # attributes that are 'hidden' (start with an underscore) or whose name is
@@ -731,7 +731,7 @@
         globals.backup_name = generate_default_backup_name(backend_url)
 
     # set and expand archive dir
-    set_archive_dir(expand_archive_dir(globals.archive_dir,
+    set_archive_dir(expand_archive_dir(globals.archive_dir_root,
                                        globals.backup_name))
 
     log.Info(_("Using archive dir: %s") % (util.ufn(globals.archive_dir.name),))

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2016-12-05 01:39:43 +0000
+++ duplicity/globals.py	2017-02-20 12:17:22 +0000
@@ -58,7 +58,7 @@
 # collection), and for checkpoint state between volumes.
 # NOTE: this gets expanded in duplicity.commandline
 os.environ["XDG_CACHE_HOME"] = os.getenv("XDG_CACHE_HOME", os.path.expanduser("~/.cache"))
-archive_dir = os.path.expandvars("$XDG_CACHE_HOME/duplicity")
+archive_dir_root = os.path.expandvars("$XDG_CACHE_HOME/duplicity")
 
 # config dir for future use
 os.environ["XDG_CONFIG_HOME"] = os.getenv("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))