diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-08-22 11:56:12 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-08-22 11:56:12 +0300 |
| commit | a3a08a4b0aa96ae03c33050920baf894cc706c9e (patch) | |
| tree | 0b05839e18951a6450b8f95fffa24a93890feacf /tests | |
| parent | 79f8122f41116659e944feb6675725d09663a0dd (diff) | |
| download | rpm-a3a08a4b0aa96ae03c33050920baf894cc706c9e.tar.gz rpm-a3a08a4b0aa96ae03c33050920baf894cc706c9e.tar.bz2 rpm-a3a08a4b0aa96ae03c33050920baf894cc706c9e.zip | |
Use rpmfiConfigConflictIndex() for modified config testing on erase too
- Besides eliminating another copy-paste variant of the config file
digest calculation and comparison, this fixes the case modified
%config symlink gets silently erased. Unlike a regular config file,
a symlink does not contain a whole lot of carefully tuned data, but
if it's marked %config I think we should honor the %config file rules.
- Adjust test-suite expectations to match the new behavior.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rpmconfig2.at | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/rpmconfig2.at b/tests/rpmconfig2.at index 373bdf8f8..1b9bb648a 100644 --- a/tests/rpmconfig2.at +++ b/tests/rpmconfig2.at @@ -92,10 +92,8 @@ test ! -L "${cf}" AT_CLEANUP # Erase modified config link -# Broken, no backup taken AT_SETUP([erase changed config link]) AT_KEYWORDS([install]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ RPMDB_CLEAR RPMDB_INIT |