Merge lp:~mterry/duplicity/log-path-type into lp:duplicity/0.6

Proposed by Michael Terry
Status: Merged
Merged at revision: 933
Proposed branch: lp:~mterry/duplicity/log-path-type
Merge into: lp:duplicity/0.6
Diff against target: 14 lines (+3/-2)
1 file modified
bin/duplicity (+3/-2)
To merge this branch: bzr merge lp:~mterry/duplicity/log-path-type
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+193677@code.launchpad.net

Description of the change

Any backup browser built on top of duplicity will need to indicate which files in the backup are folders and which are files. The current logging information doesn't provide this detail. So I've added a field to the log.InfoCode.file_list output that includes the path type.

Thanks!

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 2013-09-20 01:32:31 +0000
3+++ bin/duplicity 2013-11-02 06:02:23 +0000
4@@ -665,8 +665,9 @@
5 if path.difftype != "deleted":
6 user_info = "%s %s" % (dup_time.timetopretty(path.getmtime()),
7 path.get_relative_path())
8- log_info = "%s %s" % (dup_time.timetostring(path.getmtime()),
9- util.escape(path.get_relative_path()))
10+ log_info = "%s %s %s" % (dup_time.timetostring(path.getmtime()),
11+ util.escape(path.get_relative_path()),
12+ path.type)
13 log.Log(user_info, log.INFO, log.InfoCode.file_list,
14 log_info, True)
15

Subscribers

People subscribed via source and target branches

to all changes: