Merge lp:~noizyland/duplicity/fix-progress into lp:~duplicity-team/duplicity/0.7-series

[Scott McKenzie]

Fixes bug 1264744.

selection.filelist_globbing_get_sfs leaves the filelist file object's position at the end of the file. When the --progress option is used the filelists need to be read twice. On the second read nothing is read from the file because file has already been read and the position is EOF.

This patch calls seek(0) on the filelist to reset the position to BOF so that subsequent read() calls will return data.

[lp:~noizyland/duplicity/fix-progress]

1096. By Scott McKenzie on 2015-05-25

Perform seek(0) on filelist before read().

[Aaron Whitehouse (aaron-whitehouse)]

Apologies for my delay in looking at this (which Kenneth has now already merged).

With this (merged) change, the test for the bug now passes, so I have separately suggested re-enabling that test:
https://code.launchpad.net/~aaron-whitehouse/duplicity/reactivate_progress_test/+merge/263732

Thanks for sorting.

review: Approve

=== modified file 'duplicity/selection.py'
--- duplicity/selection.py	2015-03-13 12:22:29 +0000
+++ duplicity/selection.py	2015-05-25 11:02:28 +0000
@@ -351,6 +351,7 @@
         # Internal. Used by ParseArgs.
         log.Notice(_("Reading globbing filelist %s") % list_name)
         separator = globals.null_separator and "\0" or "\n"
+        filelist_fp.seek(0)
         for line in filelist_fp.read().split(separator):
             line, include = self.filelist_sanitise_line(line, inc_default)
             if not line: