Merge lp:~benoit.bertholon/duplicity/duplicity into lp:~duplicity-team/duplicity/0.8-series

[Benoit Bertholon]

[lp:~benoit.bertholon/duplicity/duplicity]

1178. By Kenneth Loafman on 2017-02-21

* Merged in lp:~marix/duplicity/azure-storage-0.30.0-plus
  - This makes the Azure backend compatible with version 0.30.0 and up of the
    underlying azure-storage package.

1179. By Kenneth Loafman on 2017-02-21

* Merged in lp:~marix/duplicity/azure-storage-sas
  - This branch adds support for Shared Access Signature to the Azure backend
    which allows to run Duplicity with a minimal set of permissions.

1180. By Kenneth Loafman on 2017-02-21

* Fix minor pep8 issue - line too long.

1181. By Kenneth Loafman on 2017-02-21

* Merged in lp:~aaron-whitehouse/duplicity/pep8_test_fixes
  - Fix PEP-8 testing by moving to using pycodestyle library.
  - Temporarily add ignores to allow these tests to pass.
  - Fix E305 PEP8 errors: expected 2 blank lines after class or function definition, found 1.

1182. By Kenneth Loafman on 2017-02-21

* Merged in lp:~benoit.bertholon/duplicity/duplicity
  - Fixes bug #1666194 - ProcessCommandLine function called twice fail and arglist argument not used

=== 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"))