← Back to branch summary

~ubuntu-branches/ubuntu/natty/duplicity/natty-proposed

« back to all changes in this revision

Viewing changes to duplicity

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2010-11-26 22:16:04 UTC
  • mfrom: (1.7.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101126221604-ugyl186ddlt2whtl
Tags: 0.6.11-0ubuntu1
https://launchpad.net/bugs/637556
* New upstream release
  - os.execve should get passed program as first argument (LP: #637556)
* debian/patches/04fixrsyncbackend.patch:
  - Remove previous patch, as it was applied upstream
  - Change it to fix new upstream rsync backend bug, 681980

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity
2
2
# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
3
3
#
4
4
# duplicity -- Encrypted bandwidth efficient backup
5
 
# Version 0.6.10 released September 19, 2010
 
5
# Version 0.6.11 released November 20, 2010
6
6
#
7
7
# Copyright 2002 Ben Escoto <ben@emerose.org>
8
8
# Copyright 2007 Kenneth Loafman <kenneth@loafman.com>
1031
1031
    log Python, duplicity, and system versions
1032
1032
    """
1033
1033
    log.Log('=' * 80, verbosity)
1034
 
    log.Log("duplicity 0.6.10 (September 19, 2010)", verbosity)
 
1034
    log.Log("duplicity 0.6.11 (November 20, 2010)", verbosity)
1035
1035
    log.Log("Args: %s" % (' '.join(sys.argv),), verbosity)
1036
1036
    log.Log(' '.join(platform.uname()), verbosity)
1037
1037
    log.Log("%s %s" % (sys.executable or sys.platform, sys.version), verbosity)
1071
1071
                log.Notice(_("RESTART: The first volume failed to upload before termination.\n"
1072
1072
                             "         Restart is impossible...starting backup from beginning."))
1073
1073
                self.last_backup.delete()
1074
 
                os.execve(sys.argv[0], sys.argv[1:], os.environ)
 
1074
                os.execve(sys.argv[0], sys.argv, os.environ)
1075
1075
            elif mf_len - self.start_vol > 0:
1076
1076
                # upload of N vols failed, fix manifest and restart
1077
1077
                log.Notice(_("RESTART: Volumes %d to %d failed to upload before termination.\n"