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/regular.symb.out/systems/version2/run/etc/afile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile (limited to 'tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile') diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile new file mode 100644 index 0000000..e69de29 -- cgit v1.2.1