From 6cb1a8772364e96e62cfda74490db9848c885635 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 19 Sep 2014 12:22:35 +0100 Subject: Allow replacing a file with a compatibility symlink This means we can do stuff like moving /etc/os-release into /usr/lib and leaving a compatibility symlink where the file was. Previously baserock-system-config-sync would fail with the following: ERROR: found two different types for 'os-release': regular and symlink One of the 'failure' test cases now passes, and I've added a specific test for our 'os-release' case to the 'symblinks' test case too. --- tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release | 1 + 1 file changed, 1 insertion(+) create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release (limited to 'tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release') diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release new file mode 120000 index 0000000..c4c75b4 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release @@ -0,0 +1 @@ +../usr/lib/os-release \ No newline at end of file -- cgit v1.2.1