From 9309a4bd097971fe68b6bfa50d73614baa4844fe Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 14 Apr 2008 18:13:06 +0300
Subject: Remove glibc upgrade-helper kludge, only necessary for some ancient
 RHEL

---
 lib/psm.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib')

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);
-- 
cgit v1.2.3