Merge lp:~sajoupa/turku/turku-storage-hard-link into lp:turku

[Laurent Sesquès]

fix usage of --hard-links when preserve_hard_links is set for a source

[Colin Watson (cjwatson)]

LGTM (from looking at the bzr revision directly, since the MP diff hasn't caught up yet).

review: Approve

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

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

[lp:~sajoupa/turku/turku-storage-hard-link]

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

also check the global config for preserve_hard_links

[Tom Haddon (mthaddon)]

LGTM

review: Approve

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

Change successfully merged at revision 40

=== modified file 'turku_storage/ping.py'
--- turku_storage/ping.py	2020-06-21 22:40:22 +0000
+++ turku_storage/ping.py	2021-10-19 12:01:06 +0000
@@ -234,7 +234,7 @@
                     )
             else:
                 rsync_args.append("--inplace")
-            if self.config["preserve_hard_links"]:
+            if self.config["preserve_hard_links"] or ("preserve_hard_links" in s and s["preserve_hard_links"]):
                 rsync_args.append("--hard-links")
 
             filter_file = None