summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-10-17 19:00:10 +0000
committerjbj <devnull@localhost>2004-10-17 19:00:10 +0000
commited8a00518df4dd88d234c7ece4e6b481e21efbcc (patch)
treed7a2af89b7b6cd7f5519e11f85eddbc98a1af046
parent18f7b6bc0e5510192207766135aa4ef9fe4c3b8a (diff)
downloadlibrpm-tizen-ed8a00518df4dd88d234c7ece4e6b481e21efbcc.tar.gz
librpm-tizen-ed8a00518df4dd88d234c7ece4e6b481e21efbcc.tar.bz2
librpm-tizen-ed8a00518df4dd88d234c7ece4e6b481e21efbcc.zip
- free rpmrc when looping on --target arches (#127730).
CVS patchset: 7479 CVS date: 2004/10/17 19:00:10
-rw-r--r--CHANGES1
-rw-r--r--build.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 2bbade862..81f40066f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@
- obsolete Serial:, Copyright:, and RHNPlatform: syntax in spec files.
- permit Obsoletes: /path/to/file.
- permit Conflicts: /path/to/file.
+ - free rpmrc when looping on --target arches (#127730).
4.3.1 -> 4.3.2:
- use /etc/selinux/targeted/contexts/files/file_contexts for now.
diff --git a/build.c b/build.c
index fc9df11c1..09f51e0ae 100644
--- a/build.c
+++ b/build.c
@@ -338,6 +338,7 @@ int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
/* Read in configuration for target. */
rpmFreeMacros(NULL);
+ rpmFreeRpmrc();
(void) rpmReadConfigFiles(rcfile, target);
rc = buildForTarget(ts, arg, ba);
if (rc)
@@ -348,6 +349,7 @@ exit:
vsflags = rpmtsSetVSFlags(ts, ovsflags);
/* Restore original configuration. */
rpmFreeMacros(NULL);
+ rpmFreeRpmrc();
(void) rpmReadConfigFiles(rcfile, NULL);
return rc;