RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 04-Jun-2008 23:41:24
Branch: rpm-5_0 Handle: 2008060421412300
Modified files: (Branch: rpm-5_0)
rpm CHANGES rpmqv.c
Log:
- trash-and-restore macro config for multiple CLI arg builds.
Summary:
Revision Changes Path
1.2054.2.77 +2 -0 rpm/CHANGES
1.140.2.3 +13 -0 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.76 -r1.2054.2.77 CHANGES
--- rpm/CHANGES 3 Jun 2008 18:06:23 -0000 1.2054.2.76
+++ rpm/CHANGES 4 Jun 2008 21:41:23 -0000 1.2054.2.77
@@ -1,4 +1,6 @@
5.0.3 -> 5.0.4:
+ - jbj: trash-and-restore macro config for multiple CLI arg builds.
+ - jbj: rpmrepo: correct requiressqlentry tag name typo.
- jbj: fix: handle '%{arch}\' with \ at end-of-string correctly.
- jbj: tests: verify ref/* data using rpmdigest/rpmmtree.
- jbj: move rpmdigest/rpmmtree/rpmrepo back to tools/ for installation.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.140.2.2 -r1.140.2.3 rpmqv.c
--- rpm/rpmqv.c 2 Feb 2008 00:11:24 -0000 1.140.2.2
+++ rpm/rpmqv.c 4 Jun 2008 21:41:23 -0000 1.140.2.3
@@ -761,6 +761,7 @@
case MODE_REBUILD:
case MODE_RECOMPILE:
{ const char * pkg;
+ int nbuilds = 0;
while (!rpmIsVerbose())
rpmIncreaseVerbosity();
@@ -781,6 +782,11 @@
while ((pkg = poptGetArg(optCon))) {
const char * specFile = NULL;
+ if (nbuilds++ > 0) {
+ rpmFreeMacros(NULL);
+ rpmFreeRpmrc();
+ (void) rpmReadConfigFiles(NULL, NULL);
+ }
ba->cookie = NULL;
ec = rpmInstallSource(ts, pkg, &specFile, &ba->cookie);
if (ec == 0) {
@@ -800,6 +806,8 @@
case MODE_BUILD:
case MODE_TARBUILD:
{ const char * pkg;
+ int nbuilds = 0;
+
#if defined(RPM_VENDOR_OPENPKG) /*
no-auto-verbose-increase-for-track-and-fetch */
if (ba->buildChar != 't' && ba->buildChar != 'f')
#endif
@@ -865,6 +873,11 @@
}
while ((pkg = poptGetArg(optCon))) {
+ if (nbuilds++ > 0) {
+ rpmFreeMacros(NULL);
+ rpmFreeRpmrc();
+ (void) rpmReadConfigFiles(NULL, NULL);
+ }
ba->rootdir = rpmcliRootDir;
ba->passPhrase = passPhrase;
ba->cookie = NULL;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
