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

[Laurent Sesquès]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Tom Haddon (mthaddon)]

One minor comment inline

[lp:~sajoupa/turku/turku-storage-link-dest-add-fuzzy]

41. By Laurent Sesquès on 2021-10-20

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

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 41

=== 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 @@
                     rsync_args.append(
                         "--link-dest=%s" % os.path.join(snapshot_dir, base_snapshot)
                     )
+                    # repeat the option so that rsync looks into the dir specified in link-dest, see rsync(1)
+                    rsync_args.extend(["--fuzzy", "--fuzzy"])
             else:
                 rsync_args.append("--inplace")
             if self.config["preserve_hard_links"] or ("preserve_hard_links" in s and s["preserve_hard_links"]):