Merge lp:~mterry/duplicity/missing-unicode-escape into lp:~duplicity-team/duplicity/0.7-series

Proposed by Michael Terry
Status: Merged
Merged at revision: 1015
Proposed branch: lp:~mterry/duplicity/missing-unicode-escape
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 12 lines (+1/-1)
1 file modified
bin/duplicity (+1/-1)
To merge this branch: bzr merge lp:~mterry/duplicity/missing-unicode-escape
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+240780@code.launchpad.net

Description of the change

Convert restore_dir to unicode before printing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/duplicity'
2--- bin/duplicity 2014-10-27 02:27:36 +0000
3+++ bin/duplicity 2014-11-05 21:20:49 +0000
4@@ -691,7 +691,7 @@
5 restore_get_patched_rop_iter(col_stats)):
6 if globals.restore_dir:
7 log.FatalError(_("%s not found in archive, no files restored.")
8- % (globals.restore_dir,),
9+ % (util.ufn(globals.restore_dir)),
10 log.ErrorCode.restore_dir_not_found)
11 else:
12 log.FatalError(_("No files found in archive - nothing restored."),

Subscribers

People subscribed via source and target branches