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

Proposed by Laurent Sesques
Status: Merged
Approved by: Tom Haddon
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~sajoupa/turku/turku-storage-hard-link
Merge into: lp:turku
Diff against target: 12 lines (+1/-1)
1 file modified
turku_storage/ping.py (+1/-1)
To merge this branch: bzr merge lp:~sajoupa/turku/turku-storage-hard-link
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Colin Watson (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+410395@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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

review: Approve
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.

41. By Laurent Sesques

also check the global config for preserve_hard_links

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

LGTM

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

Change successfully merged at revision 40

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'turku_storage/ping.py'
2--- turku_storage/ping.py 2020-06-21 22:40:22 +0000
3+++ turku_storage/ping.py 2021-10-19 12:01:06 +0000
4@@ -234,7 +234,7 @@
5 )
6 else:
7 rsync_args.append("--inplace")
8- if self.config["preserve_hard_links"]:
9+ if self.config["preserve_hard_links"] or ("preserve_hard_links" in s and s["preserve_hard_links"]):
10 rsync_args.append("--hard-links")
11
12 filter_file = None

Subscribers

People subscribed via source and target branches

to all changes: