Merge lp:~sajoupa/turku/turku-storage-link-dest-add-fuzzy into lp:turku

Proposed by Laurent Sesquès
Status: Merged
Approved by: Haw Loeung
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~sajoupa/turku/turku-storage-link-dest-add-fuzzy
Merge into: lp:turku
Diff against target: 12 lines (+2/-0)
1 file modified
turku_storage/ping.py (+2/-0)
To merge this branch: bzr merge lp:~sajoupa/turku/turku-storage-link-dest-add-fuzzy
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+410391@code.launchpad.net

Commit message

When using --link-dest, add --fuzzy, twice so that rsync looks up into the directory specified by --link-dest

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

One minor comment inline

41. By Laurent Sesquès

small fix: extend th rsync_args array instead of appending to it

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM, thx

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 41

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'turku_storage/ping.py'
--- turku_storage/ping.py 2021-10-19 12:00:50 +0000
+++ turku_storage/ping.py 2021-10-20 15:38:18 +0000
@@ -232,6 +232,8 @@
232 rsync_args.append(232 rsync_args.append(
233 "--link-dest=%s" % os.path.join(snapshot_dir, base_snapshot)233 "--link-dest=%s" % os.path.join(snapshot_dir, base_snapshot)
234 )234 )
235 # repeat the option so that rsync looks into the dir specified in link-dest, see rsync(1)
236 rsync_args.extend(["--fuzzy", "--fuzzy"])
235 else:237 else:
236 rsync_args.append("--inplace")238 rsync_args.append("--inplace")
237 if self.config["preserve_hard_links"] or ("preserve_hard_links" in s and s["preserve_hard_links"]):239 if self.config["preserve_hard_links"] or ("preserve_hard_links" in s and s["preserve_hard_links"]):

Subscribers

People subscribed via source and target branches

to all changes: