Duplicity

Merge lp:~scode/duplicity/misc into lp:~duplicity-team/duplicity/trunk

  1. misc
  2. Merge into trunk
Proposed by Kenneth Loafman
Status: Merged
Approved by: Kenneth Loafman
Approved revision: 552
Merged at revision: not available
Proposed branch: lp:~scode/duplicity/misc
Merge into: lp:~duplicity-team/duplicity/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~scode/duplicity/misc
Reviewer Review Type Date Requested Status
Kenneth Loafman Approve
Review via email: mp+9053@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kenneth Loafman (kenneth-loafman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity-bin'
2--- duplicity-bin 2009-07-07 17:04:19 +0000
3+++ duplicity-bin 2009-07-08 16:52:47 +0000
4@@ -467,8 +467,9 @@
5 """
6 dup_time.setprevtime(sig_chain.end_time)
7 if dup_time.curtime == dup_time.prevtime:
8- time.sleep(1)
9+ time.sleep(2)
10 dup_time.setcurtime()
11+ assert dup_time.curtime != dup_time.prevtime, "time not moving forward at appropriate pace - system clock issues?"
12 if globals.dry_run:
13 tarblock_iter = diffdir.DirDelta(globals.select,
14 sig_chain.get_fileobjs())
15
16=== modified file 'duplicity/collections.py'
17--- duplicity/collections.py 2009-07-07 17:04:19 +0000
18+++ duplicity/collections.py 2009-07-08 17:13:40 +0000
19@@ -770,7 +770,7 @@
20 """
21 Split given filename_list into chains
22
23- Return value will be pair (list of chains, list of sets, list
24+ Return value will be tuple (list of chains, list of sets, list
25 of incomplete sets), where the list of sets will comprise sets
26 not fitting into any chain, and the incomplete sets are sets
27 missing files.

Subscribers

People subscribed via source and target branches