teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.12-beta-print-deps.patch

Panu Matilainen 13df4a
commit 404f053f7829fa859209ded8399243dba851f263
Panu Matilainen 13df4a
Author: Panu Matilainen <pmatilai@redhat.com>
Panu Matilainen 13df4a
Date:   Mon Aug 25 10:41:27 2014 +0300
Panu Matilainen 13df4a
Panu Matilainen 13df4a
    Resurrect dependency spew during build
Panu Matilainen 13df4a
    
Panu Matilainen 13df4a
    - Since commit a357c99c58a5e1367160dfa692f26d14bd3a3df1 the dependencies
Panu Matilainen 13df4a
      are no longer in the header so there's little to print from there.
Panu Matilainen 13df4a
      As it happens things are much saner this way, we no longer need
Panu Matilainen 13df4a
      to create rpmds'es just to print stuff.
Panu Matilainen 13df4a
Panu Matilainen 13df4a
diff --git a/build/rpmfc.c b/build/rpmfc.c
Panu Matilainen 13df4a
index e798950..f22053c 100644
Panu Matilainen 13df4a
--- a/build/rpmfc.c
Panu Matilainen 13df4a
+++ b/build/rpmfc.c
Panu Matilainen 13df4a
@@ -1110,7 +1110,7 @@ static DepMsg_t DepMsgs = depMsgs;
Panu Matilainen 13df4a
 
Panu Matilainen 13df4a
 /**
Panu Matilainen 13df4a
  */
Panu Matilainen 13df4a
-static void printDeps(rpmstrPool pool, Header h)
Panu Matilainen 13df4a
+static void printDeps(rpmfc fc)
Panu Matilainen 13df4a
 {
Panu Matilainen 13df4a
     DepMsg_t dm;
Panu Matilainen 13df4a
     rpmds ds = NULL;
Panu Matilainen 13df4a
@@ -1120,8 +1120,7 @@ static void printDeps(rpmstrPool pool, Header h)
Panu Matilainen 13df4a
 
Panu Matilainen 13df4a
     for (dm = DepMsgs; dm->msg != NULL; dm++) {
Panu Matilainen 13df4a
 	if (dm->ntag != -1) {
Panu Matilainen 13df4a
-	    rpmdsFree(ds);
Panu Matilainen 13df4a
-	    ds = rpmdsNewPool(pool, h, dm->ntag, 0);
Panu Matilainen 13df4a
+	    ds = rpmfcDependencies(fc, dm->ntag);
Panu Matilainen 13df4a
 	}
Panu Matilainen 13df4a
 	if (dm->ftag == 0)
Panu Matilainen 13df4a
 	    continue;
Panu Matilainen 13df4a
@@ -1148,7 +1147,6 @@ static void printDeps(rpmstrPool pool, Header h)
Panu Matilainen 13df4a
 	if (bingo)
Panu Matilainen 13df4a
 	    rpmlog(RPMLOG_NOTICE, "\n");
Panu Matilainen 13df4a
     }
Panu Matilainen 13df4a
-    rpmdsFree(ds);
Panu Matilainen 13df4a
 }
Panu Matilainen 13df4a
 
Panu Matilainen 13df4a
 static rpmRC rpmfcGenerateDependsHelper(const rpmSpec spec, Package pkg, rpmfi fi)
Panu Matilainen 13df4a
@@ -1333,7 +1331,7 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
Panu Matilainen 13df4a
 	free(msg);
Panu Matilainen 13df4a
     }
Panu Matilainen 13df4a
 exit:
Panu Matilainen 13df4a
-    printDeps(fc ? fc->pool : NULL, pkg->header);
Panu Matilainen 13df4a
+    printDeps(fc);
Panu Matilainen 13df4a
 
Panu Matilainen 13df4a
     /* Clean up. */
Panu Matilainen 13df4a
     free(fmode);