duplicity-team team mailing list archive

[Mgorse <mgorse@xxxxxxxx>]

Mgorse has proposed merging lp:~mgorse/duplicity/0.7-series into lp:duplicity/0.7-series.

Commit message:
Fix bug 1828869: refresh CollectionsStatus after sync

Requested reviews:
  duplicity-team (duplicity-team)

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

=== modified file 'bin/duplicity'
--- bin/duplicity	2019-04-24 07:52:22 +0000
+++ bin/duplicity	2019-05-20 09:03:08 +0000
@@ -1049,8 +1049,14 @@
         except collections.CollectionsError:
             # With zero or multiple chains at this time, do a full sync
             return True
-        return parsed.end_time >= target_chain.start_time and \
-            parsed.start_time <= target_chain.end_time
+        if parsed.start_time is None and parsed.end_time is None:
+            start_time = end_time = parsed.time
+        else:
+            start_time = parsed.start_time
+            end_time = parsed.end_time
+
+        return end_time >= target_chain.start_time and \
+            start_time <= target_chain.end_time
 
     def get_metafiles(filelist):
         """
@@ -1228,6 +1234,7 @@
                 globals.backend.pre_process_download(local_missing)
             for fn in local_missing:
                 copy_to_local(fn)
+            col_stats.set_values()
         else:
             if local_missing:
                 log.Notice(_("Sync would copy the following from remote to local:") +