From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 10 Sep 2009 12:02:36 +0000 (+0300)
Subject: Rip the broken ldconfig optimization hack (RhBug:513224)
X-Git-Tag: rpm-4.8.0-beta1~292
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b2858d13e0af704c7ace8b95751cc2dd60acd7c;p=platform%2Fupstream%2Frpm.git

Rip the broken ldconfig optimization hack (RhBug:513224)
- it doesn't optimize much and what's worse, it sometimes optimizes out
  calls that would've been necessary
---

diff --git a/lib/psm.c b/lib/psm.c
index 6a061a6..8c3b9f2 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -527,12 +527,6 @@ static rpmRC runLuaScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t argv,
     return rc;
 }
 
-/**
- */
-static int ldconfig_done = 0;
-
-static const char * ldconfig_path = "/sbin/ldconfig";
-
 static void doScriptExec(rpmts ts, ARGV_const_t argv, rpmtd prefixes,
 			FD_t scriptFd, FD_t out)
 {
@@ -670,27 +664,11 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 
     psm->sq.reaper = 1;
 
-    /*
-     * If a successor node, and ldconfig was just run, don't bother.
-     */
-    if (ldconfig_path && *argvp != NULL && psm->unorderedSuccessor) {
- 	if (ldconfig_done && rstreq(*argvp[0], ldconfig_path)) {
-	    rpmlog(RPMLOG_DEBUG, "%s: %s skipping redundant \"%s\".\n",
-		   psm->stepName, sname, *argvp[0]);
-	    free(sname);
-	    return RPMRC_OK;
-	}
-    }
-
     rpmlog(RPMLOG_DEBUG, "%s: %s %ssynchronous scriptlet start\n",
 	   psm->stepName, sname, (psm->unorderedSuccessor ? "a" : ""));
 
     if (argvCount(*argvp) == 0) {
 	argvAdd(argvp, "/bin/sh");
-	ldconfig_done = 0;
-    } else {
-	ldconfig_done = (ldconfig_path && rstreq(*argvp[0], ldconfig_path)
-		? 1 : 0);
     }
 
 
@@ -717,9 +695,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 	    xx = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
 	}
 
-	if (ldconfig_path && strstr(script, ldconfig_path) != NULL)
-	    ldconfig_done = 1;
-
 	xx = Fwrite(script, sizeof(script[0]), strlen(script), fd);
 	xx = Fclose(fd);