rpmSetTables() call in rpmbuild has been dying long enough by now
authorPanu Matilainen <pmatilai@redhat.com>
Fri, 9 Mar 2012 11:05:38 +0000 (13:05 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Fri, 9 Mar 2012 11:05:38 +0000 (13:05 +0200)
- The call to rpmSetTables() from rpmbuild is simply redundant for
  all I can tell, it gets called from inside rpmrc/config processing
  with the same values and the extra call here never changes anything
  as the tables have already been set through rpmReadConfigFiles()
  whether building for several targets or not.

rpmbuild.c

index a338c3c..bbe94ce 100644 (file)
@@ -367,10 +367,6 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
     int justRm = ((buildAmount & ~(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)) == 0);
     rpmSpecFlags specFlags = spec_flags;
 
-#ifndef        DYING
-    rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
-#endif
-
     if (ba->buildRootOverride)
        buildRootURL = rpmGenPath(NULL, ba->buildRootOverride, NULL);