From 2c251e0aea25c12c8faa3a12931142c96822870d Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
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 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'baserock-system-config-sync/baserock-system-config-sync')

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"
-- 
cgit v1.2.1