Ignacio Quezada has proposed merging lp:~fenisilius/duplicity/acd_init_mkdir into lp:duplicity.
Requested reviews: duplicity-team (duplicity-team) For more details, see: https://code.launchpad.net/~fenisilius/duplicity/acd_init_mkdir/+merge/302226 After the acd_cli init is done, and the keys are set, duplicity can't create directories on the remote server. A more natural use would be to let duplicity to create the remote folder, this patch tries to help on that. -- Your team duplicity-team is requested to review the proposed merge of lp:~fenisilius/duplicity/acd_init_mkdir into lp:duplicity.
=== modified file 'CHANGELOG' --- CHANGELOG 2016-07-31 12:18:43 +0000 +++ CHANGELOG 2016-08-07 21:03:12 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE New in v0.8.00 (2016/07/??) --------------------------- * Merged in lp:~aaron-whitehouse/duplicity/remove-python26 @@ -16,6 +17,30 @@ - merge fixes setsid usage in functional testing. +======= +New in v0.7.10 (2016/08/??) +--------------------------- +* Merged in lp:~mwilck/duplicity/0.7-series + - Speedup of path_matches_glob() by about 8x. See + https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301332 + for more details. +* Remove -w from setsid in functional tests. +* Fixed conflict in merge from Martin Wilck and applied + - https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301492 + - merge fixes setsid usage in functional testing. + + +New in v0.7.09 (2016/07/24) +--------------------------- +* Fixed bug #1600692 with patch from Wolfgang Rohdewald + - Allow symlink to have optional trailing slash during verify. +* Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files + - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224, + as this was affecting other applications (e.g. deja dup; Bug #1605939). +* Merged in lp:~duplicity-team/duplicity/po-updates + + +>>>>>>> MERGE-SOURCE New in v0.7.08 (2016/07/02) --------------------------- * Merged in lp:~noizyland/duplicity/fix_azurebackend_typo @@ -71,6 +96,9 @@ * Fixed bug #1570293 duplicity is very slow due to excessive fsync - removed flush() after write. - revert to previous version +* Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files + - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224, + as this was affecting other applications (e.g. deja dup; Bug #1605939). New in v0.7.07 (2016/04/10) === modified file 'Changelog.GNU' --- Changelog.GNU 2016-07-31 12:18:43 +0000 +++ Changelog.GNU 2016-08-07 21:03:12 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE 2016-07-31 Kenneth Loafman <[email protected]> * Fixed conflict in merge from Martin Wilck and applied @@ -17,6 +18,29 @@ - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224, as this was affecting other applications (e.g. deja dup; Bug #1605939). +======= +2016-07-31 Kenneth Loafman <[email protected]> + + * Fixed conflict in merge from Martin Wilck and applied + - https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301492 + - merge fixes setsid usage in functional testing. + +2016-07-28 Kenneth Loafman <[email protected]> + + * Merged in lp:~mwilck/duplicity/0.7-series + - Speedup of path_matches_glob() by about 8x. See + https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301332 + for more details. + * Remove -w from setsid in functional tests. + +2016-07-24 Kenneth Loafman <[email protected]> + + * Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files + - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224, + as this was affecting other applications (e.g. deja dup; Bug #1605939). + * Prep for 0.7.09 + +>>>>>>> MERGE-SOURCE 2016-07-20 Kenneth Loafman <[email protected]> * Fixed bug #1600692 with patch from Wolfgang Rohdewald === modified file 'duplicity/backends/acdclibackend.py' --- duplicity/backends/acdclibackend.py 2016-06-28 21:03:46 +0000 +++ duplicity/backends/acdclibackend.py 2016-08-07 21:03:12 +0000 @@ -59,6 +59,16 @@ self.subprocess_popen(self.acd_cmd + " sync") + # Initialize remote directory + remote_path = urllib.unquote(self.parsed_url.path.replace('///', '/')).rstrip() + commandline = self.acd_cmd + " ls '%s'" % (remote_path) + try: + self.subprocess_popen(commandline) + except BackendException as e: + if e.code == 50: # Remote directory not there, create a new one + commandline = self.acd_cmd + " mkdir '%s'" % remote_path + self.subprocess_popen(commandline) + def _put(self, source_path, remote_filename=None): """Transfer source_path to remote_filename""" if not remote_filename: === modified file 'po/duplicity.pot' --- po/duplicity.pot 2016-07-28 14:44:44 +0000 +++ po/duplicity.pot 2016-08-07 21:03:12 +0000 @@ -8,7 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Kenneth Loafman <[email protected]>\n" +<<<<<<< TREE "POT-Creation-Date: 2016-07-28 09:22-0500\n" +======= +"POT-Creation-Date: 2016-07-31 07:02-0500\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" === added file 'testing/gnupg/gpg.conf' --- testing/gnupg/gpg.conf 1970-01-01 00:00:00 +0000 +++ testing/gnupg/gpg.conf 2016-08-07 21:03:12 +0000 @@ -0,0 +1,9 @@ +# gpg2 doesn't try all secrets by default, so add this option +# Otherwise the tests with hidden encryption key will fail +try-all-secrets + +# gpg2 2.1.13 has a bug that prevents the line above from working +# (https://bugs.gnupg.org/gnupg/issue1985) +# Uncomment the line below if you have gnupg2 2.1.13 +# (but that line will break gpg 1.x, so we can't use it by default) +#try-secret-key 96B629431B77DC52B1917B40839E6A2856538CCF === renamed file 'testing/gnupg/gpg.conf' => 'testing/gnupg/gpg.conf.moved'
_______________________________________________ Mailing list: https://launchpad.net/~duplicity-team Post to : [email protected] Unsubscribe : https://launchpad.net/~duplicity-team More help : https://help.launchpad.net/ListHelp
