diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-19 12:22:35 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-19 12:15:47 +0000 |
| commit | 6cb1a8772364e96e62cfda74490db9848c885635 (patch) | |
| tree | 1dbc6c1058475fa4f74f7524f1d52686e57843ce /tests/bscs-merge.fail/regular.symb.in/systems/factory/run | |
| parent | a6c4f3b9a1d7cb509ccce670c7d2ee4048e56525 (diff) | |
| download | tbdiff-6cb1a8772364e96e62cfda74490db9848c885635.tar.gz | |
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.
Diffstat (limited to 'tests/bscs-merge.fail/regular.symb.in/systems/factory/run')
| l--------- | tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 | 1 | ||||
| -rw-r--r-- | tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 b/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 deleted file mode 120000 index 6a93f4f..0000000 --- a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 +++ /dev/null @@ -1 +0,0 @@ -afile
\ No newline at end of file diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile b/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile deleted file mode 100644 index e69de29..0000000 --- a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile +++ /dev/null |