← Back to branch summary

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

« back to all changes in this revision

Viewing changes to duplicity/diffdir.py

  • Committer: loafman
  • Date: 2008-12-22 17:22:44 UTC
  • Revision ID: vcs-imports@canonical.com-20081222172244-cjurdc0mt5d41n6d
patch #6700: Make duplicity translatable
https://savannah.nongnu.org/patch/?6700

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/diffdir.py
92
92
        index_string = sig_path.get_relative_path()
93
93
    else:
94
94
        assert 0, "Both new and sig are None for some reason"
95
 
    log.Log("Error %s getting delta for %s" % (str(exc), index_string), 2)
 
95
    log.Log(_("Error %s getting delta for %s") % (str(exc), index_string), 2)
96
96
    return None
97
97
 
98
98
 
104
104
        ti = new_path.get_tarinfo()
105
105
        index = new_path.index
106
106
    delta_path = new_path.get_ropath()
107
 
    log.Log("Getting delta of %s and %s" % (new_path, sig_path), 7)
 
107
    log.Log(_("Getting delta of %s and %s") % (new_path, sig_path), 7)
108
108
 
109
109
    def callback(sig_string):
110
110
        """Callback activated when FileWithSignature read to end"""
145
145
    if delta_path.difftype == "snapshot":
146
146
        if new_path:
147
147
            stats.add_new_file(new_path)
148
 
        log.Info("Generating delta - new file: %s" %
 
148
        log.Info(_("Generating delta - new file: %s") %
149
149
                 (delta_path.get_relative_path(),),
150
150
                 log.InfoCode.diff_file_new,
151
151
                 util.escape(delta_path.get_relative_path()))
152
152
    else:
153
153
        if new_path:
154
154
            stats.add_changed_file(new_path)
155
 
        log.Info("Generating delta - changed file: %s" %
 
155
        log.Info(_("Generating delta - changed file: %s") %
156
156
                 (delta_path.get_relative_path(),),
157
157
                 log.InfoCode.diff_file_changed,
158
158
                 util.escape(delta_path.get_relative_path()))
173
173
    else:
174
174
        sigTarFile = None
175
175
    for new_path, sig_path in collated:
176
 
        log.Log("Comparing %s and %s" % (new_path and new_path.index,
177
 
                                         sig_path and sig_path.index), 6)
 
176
        log.Log(_("Comparing %s and %s") % (new_path and new_path.index,
 
177
                                            sig_path and sig_path.index), 6)
178
178
        if not new_path or not new_path.type:
179
179
            # file doesn't exist
180
180
            if sig_path and sig_path.exists():
181
181
                # but signature says it did
182
 
                log.Info("Generating delta - deleted file: %s" %
 
182
                log.Info(_("Generating delta - deleted file: %s") %
183
183
                         (sig_path.get_relative_path(),),
184
184
                         log.InfoCode.diff_file_deleted,
185
185
                         util.escape(sig_path.get_relative_path()))