summaryrefslogtreecommitdiff
path: root/tests/rpmdb.at
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2019-06-26 15:41:17 +0200
committerPanu Matilainen <pmatilai@redhat.com>2019-08-28 12:16:52 +0300
commit21836bc7524f8fc07972e0e56eed1c3b68775368 (patch)
tree5707b5ed8e089354a1a76184d826fb0bfed0d485 /tests/rpmdb.at
parent61c39e75bef0e31169fa20a047e6ff4bca3d917c (diff)
downloadrpm-21836bc7524f8fc07972e0e56eed1c3b68775368.tar.gz
Use an erase element to delete packages with same NEVRA
Rpm used to rely on the "replacepkgs hack" to get rid of the old header entry when reinstalling a package. This has a number of problems when the headers are not identical or different install flags were used. To mitigate this, a '--reinstall' option was added that made rpm use an erase element in this case. This commit takes this one step further by changing the code to also use an erase element in the --upgrade case. The code is mostly simpler, but we need a different implementation for commit fd40d58efa, as we now have erase elements both for --reinstall and --upgrade. Thus we need to store the addop in the transaction element. The commit does not change the behaviour of 'rpm --install'. (cherry picked from commit 0fcf8c2b8692fbe06b0bb353247f9d70c91c14a1)
Diffstat (limited to 'tests/rpmdb.at')
-rw-r--r--tests/rpmdb.at1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index e1893c7cd..f26c09c7c 100644
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -129,7 +129,6 @@ AT_SETUP([rpm -U --replacepkgs 2])
AT_KEYWORDS([rpmdb install])
AT_CHECK([
-AT_XFAIL_IF([test $RPM_XFAIL -ne 0])
RPMDB_CLEAR
RPMDB_INIT