summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-04-14 18:13:06 +0300
committerPanu Matilainen <pmatilai@redhat.com>2008-04-14 18:13:06 +0300
commit9309a4bd097971fe68b6bfa50d73614baa4844fe (patch)
tree961f7abad5d7f00e413b2a799de316aa29199376 /lib
parenta4bbf08f4d365f2d5ff746917cb8cfa66c1d3c51 (diff)
downloadrpm-9309a4bd097971fe68b6bfa50d73614baa4844fe.tar.gz
rpm-9309a4bd097971fe68b6bfa50d73614baa4844fe.tar.bz2
rpm-9309a4bd097971fe68b6bfa50d73614baa4844fe.zip
Remove glibc upgrade-helper kludge, only necessary for some ancient RHEL
Diffstat (limited to 'lib')
-rw-r--r--lib/psm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/psm.c b/lib/psm.c
index 2e6d64c29..ea324b531 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -828,8 +828,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
(void) psmWait(psm);
- /* XXX filter order dependent multilib "other" arch helper error. */
- if (!(psm->sq.reaped >= 0 && !strcmp(*argvp[0], "/usr/sbin/glibc_post_upgrade") && WEXITSTATUS(psm->sq.status) == 110)) {
if (psm->sq.reaped < 0) {
(void) rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR,
stag, WTERMSIG(psm->sq.child));
@@ -851,7 +849,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
}
rc = RPMRC_FAIL;
}
- }
exit:
if (freePrefixes) prefixes = hfd(prefixes, ipt);