Merge lp:~mgorse/duplicity/0.7-series into lp:~duplicity-team/duplicity/0.7-series

Proposed by Mgorse
Status: Merged
Merged at revision: 1375
Proposed branch: lp:~mgorse/duplicity/0.7-series
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 28 lines (+9/-2)
1 file modified
bin/duplicity (+9/-2)
To merge this branch: bzr merge lp:~mgorse/duplicity/0.7-series
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+367632@code.launchpad.net

Commit message

Fix bug 1828869: refresh CollectionsStatus after sync

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/duplicity'
--- bin/duplicity 2019-04-24 07:52:22 +0000
+++ bin/duplicity 2019-05-20 09:07:35 +0000
@@ -1049,8 +1049,14 @@
1049 except collections.CollectionsError:1049 except collections.CollectionsError:
1050 # With zero or multiple chains at this time, do a full sync1050 # With zero or multiple chains at this time, do a full sync
1051 return True1051 return True
1052 return parsed.end_time >= target_chain.start_time and \1052 if parsed.start_time is None and parsed.end_time is None:
1053 parsed.start_time <= target_chain.end_time1053 start_time = end_time = parsed.time
1054 else:
1055 start_time = parsed.start_time
1056 end_time = parsed.end_time
1057
1058 return end_time >= target_chain.start_time and \
1059 start_time <= target_chain.end_time
10541060
1055 def get_metafiles(filelist):1061 def get_metafiles(filelist):
1056 """1062 """
@@ -1228,6 +1234,7 @@
1228 globals.backend.pre_process_download(local_missing)1234 globals.backend.pre_process_download(local_missing)
1229 for fn in local_missing:1235 for fn in local_missing:
1230 copy_to_local(fn)1236 copy_to_local(fn)
1237 col_stats.set_values()
1231 else:1238 else:
1232 if local_missing:1239 if local_missing:
1233 log.Notice(_("Sync would copy the following from remote to local:") +1240 log.Notice(_("Sync would copy the following from remote to local:") +

Subscribers

People subscribed via source and target branches