← Back to branch summary

~ubuntu-branches/ubuntu/raring/duplicity/raring-updates

« back to all changes in this revision

Viewing changes to rdiffdir

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2011-04-03 20:40:34 UTC
  • mfrom: (1.9.1 upstream) (16.2.6 natty)
  • Revision ID: james.westby@ubuntu.com-20110403204034-5m1eri4z5qr0nyrr
Tags: 0.6.13-0ubuntu1
https://launchpad.net/bugs/613244
https://launchpad.net/bugs/579958
* Resync with Debian, no remaining changes
* New upstream release
  - silent data corruption with checkpoint/restore (LP: #613244)
  - Assertion error "time not moving forward at appropriate pace"
    (LP: #579958)
* debian/patches/04future.dpatch:
  - Dropped, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
rdiffdir
1
1
#!/usr/bin/env python
2
2
# rdiffdir -- Extend rdiff functionality to directories
3
 
# Version 0.6.06 released October 29, 2009
 
3
# Version 0.6.13 released April 02, 2011
4
4
#
5
5
# Copyright 2002 Ben Escoto <ben@emerose.org>
6
6
# Copyright 2007 Kenneth Loafman <kenneth@loafman.com>
180
180
    diffdir.write_block_iter(delta_iter, outfp)
181
181
    assert not outfp.close()
182
182
 
183
 
def write_delta_and_sig(filename, sig_infp, delta_outfp, sig_outfp):
184
 
    """Write delta and also signature of filename"""
185
 
    sel = get_selection(filename)
 
183
def write_delta_and_sig(dirname, sig_infp, outfp, sig_outfp):
 
184
    """Write delta and also signature of dirname"""
 
185
    sel = get_selection(dirname)
186
186
    delta_iter = diffdir.DirDelta_WriteSig(sel, sig_infp, sig_outfp)
187
187
    diffdir.write_block_iter(delta_iter, outfp)
188
188
    assert not sig_outfp.close()
193
193
 
194
194
def write_tar(dirname, outfp):
195
195
    """Store dirname into a tarfile, write to outfp"""
196
 
    diffdir.write_block_iter(diffdir.DirFull(get_selection(filename)), outfp)
 
196
    diffdir.write_block_iter(diffdir.DirFull(get_selection(dirname)), outfp)
197
197
 
198
198
def write_tar_and_sig(dirname, outfp, sig_outfp):
199
199
    """Write tar of dirname to outfp, signature of same to sig_outfp"""
200
 
    full_iter = diffdir.DirFull_WriteSig(get_selection(filename), sig_outfp)
 
200
    full_iter = diffdir.DirFull_WriteSig(get_selection(dirname), sig_outfp)
201
201
    diffdir.write_block_iter(full_iter, outfp)
202
202
 
203
203