From 2c251e0aea25c12c8faa3a12931142c96822870d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 25 Feb 2014 16:35:07 +0000 Subject: Fix behaviour in bscs-merge when vu and v2 don't have a file of v1 --- baserock-system-config-sync/baserock-system-config-sync | 3 ++- tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 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" diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 deleted file mode 100644 index b73be5d..0000000 --- a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1 -version=v1 -- cgit v1.2.1