← Back to branch summary

~ed.so/duplicity/reuse-passphrase-for-signing-fix

« back to all changes in this revision

Viewing changes to duplicity-bin

  • Committer: Kenneth Loafman
  • Date: 2009-09-25 14:19:25 UTC
  • Revision ID: kenneth@loafman.com-20090925141925-g2g4qdhfjsmm2ih9
Fix problems with unittests under Jaunty.  It appears that redirection
in os.system() has changed for the worse, so a workaround for now.

Fix problem in restart where there were no manifest entries and no
remote volumes stored.  We clean out the partial and restart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity-bin
1064
1064
 
1065
1065
    def checkManifest(self, mf):
1066
1066
        mf_len = len(mf.volume_info_dict)
1067
 
        if mf_len != self.start_vol:
 
1067
        if (mf_len != self.start_vol) or not (mf_len and self.start_vol):
1068
1068
            if self.start_vol == 0:
1069
1069
                # upload of 1st vol failed, clean and restart
1070
1070
                log.Notice(_("RESTART: The first volume failed to upload before termination.\n"