diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-25 16:35:07 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 12:02:28 +0000 |
| commit | 2c251e0aea25c12c8faa3a12931142c96822870d (patch) | |
| tree | a47e8ad84dc4b1cfae70bb089128928c5bf77f30 /baserock-system-config-sync | |
| parent | f585763060076fdd5104409554613b9ca110f910 (diff) | |
| download | tbdiff-2c251e0aea25c12c8faa3a12931142c96822870d.tar.gz | |
Fix behaviour in bscs-merge when vu and v2 don't have a file of v1
Diffstat (limited to 'baserock-system-config-sync')
| -rwxr-xr-x | baserock-system-config-sync/baserock-system-config-sync | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index e297197..e3fd181 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -137,7 +137,8 @@ merge_regular_file() { case "$v1_exists $vu_exists $v2_exists" in 'exists none none') - cp -a "$v1" "$vt" + # Do nothing, if the file was removed in vu and v2 doesn't have it, + # then the file is not longer needed ;; 'none exists none') cp -a "$vu" "$vt" |