Merge ~tcuthbert/turku:main into turku:main

[Thomas Cuthbert]

[James Simpson (jsimpso)]

LGTM, one comment

review: Approve

[Thomas Cuthbert (tcuthbert)]

reply inline.

review: Approve

Unmerged commits

68ac6ef... by Thomas Cuthbert on 2021-11-16

Import from Bazaar to Git

35bcfcf... by Laurent Sesquès on 2021-10-19

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

Reviewed-on: https://code.launchpad.net/~sajoupa/turku/turku-storage-hard-link/+merge/410395
Reviewed-by: Tom Haddon <email address hidden>
Reviewed-by: Colin Watson <email address hidden>

feb6f8f... by Laurent Sesquès on 2021-10-19

also check the global config for preserve_hard_links

b05ed22... by Laurent Sesquès on 2021-10-18

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

diff --git a/turku_storage/ping.py b/turku_storage/ping.py
index 60355ab..eb36c7a 100644
--- a/turku_storage/ping.py
+++ b/turku_storage/ping.py
@@ -256,7 +256,7 @@ class StoragePing:
                     )
             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