diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-08-23 14:31:33 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-08-23 14:37:52 +0300 |
| commit | 0936fbc7bb51f4643e05dfe9a98ac30c82d215e2 (patch) | |
| tree | 8dc45ca051fb3045854c40772f07c00516cdb094 /tests | |
| parent | d0b76044cf04b049d4df0838b93d005ede066949 (diff) | |
| download | rpm-0936fbc7bb51f4643e05dfe9a98ac30c82d215e2.tar.gz | |
Axe the if-what jungle in rpmfiDecideFateIndex()
- Unless the file does not exist on disk, we cannot determine the
correct action for config files and symlinks before we actually
check them. Those are also the only types that *can* result in
FA_ALTNAME/FA_SAVE action, anything else we can just create.
Besides making the logic a whole lot easier to follow, it also
fixes our remaining test-case failures. Who would've thought?
- Might be worth noting that this requires the pile of fsm fixes
from previous commits to work.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rpmconfig3.at | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/rpmconfig3.at b/tests/rpmconfig3.at index 6191ef3fe..5a32c0c34 100644 --- a/tests/rpmconfig3.at +++ b/tests/rpmconfig3.at @@ -163,10 +163,8 @@ foo AT_CLEANUP # Modified config changes to config symlink -# Broken, no backup taken AT_SETUP([upgrade modified config to config link]) AT_KEYWORDS([install]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ RPMDB_CLEAR RPMDB_INIT @@ -205,9 +203,7 @@ otherstuff AT_CLEANUP # Modified config link changes to config file -# Broken, no backup taken AT_SETUP([upgrade modified config link to config]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_KEYWORDS([install]) AT_CHECK([ RPMDB_CLEAR @@ -279,10 +275,8 @@ test -d "${cf}" AT_CLEANUP # Modified config changes to directory -# Broken, no backup taken AT_SETUP([upgrade modified config to directory]) AT_KEYWORDS([install]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ RPMDB_CLEAR RPMDB_INIT |