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

Proposed by Mgorse on 2019-05-20
Status: Merged
Merged at revision: 1375
Proposed branch: lp:~mgorse/duplicity/0.7-series
Merge into: lp: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 2019-05-20 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
1=== modified file 'bin/duplicity'
2--- bin/duplicity 2019-04-24 07:52:22 +0000
3+++ bin/duplicity 2019-05-20 09:07:35 +0000
4@@ -1049,8 +1049,14 @@
5 except collections.CollectionsError:
6 # With zero or multiple chains at this time, do a full sync
7 return True
8- return parsed.end_time >= target_chain.start_time and \
9- parsed.start_time <= target_chain.end_time
10+ if parsed.start_time is None and parsed.end_time is None:
11+ start_time = end_time = parsed.time
12+ else:
13+ start_time = parsed.start_time
14+ end_time = parsed.end_time
15+
16+ return end_time >= target_chain.start_time and \
17+ start_time <= target_chain.end_time
18
19 def get_metafiles(filelist):
20 """
21@@ -1228,6 +1234,7 @@
22 globals.backend.pre_process_download(local_missing)
23 for fn in local_missing:
24 copy_to_local(fn)
25+ col_stats.set_values()
26 else:
27 if local_missing:
28 log.Notice(_("Sync would copy the following from remote to local:") +

Subscribers

People subscribed via source and target branches