sanity.

CVS patchset: 2253
CVS date: 1998/08/16 14:26:04

diff --git a/build.c b/build.c
index 8c79320..30fc022 100644 (file)
--- a/build.c
+++ b/build.c
@@ -147,16 +147,16 @@ int build(char *arg, int buildAmount, char *passPhrase,
     char * platform;
     int rc;
 
-    /* parse up the build operators */
-
-    printf("building these platforms: %s\n", buildplatforms);
-
     if (buildplatforms == NULL) {
        rc =  buildplatform(arg, buildAmount, passPhrase, buildRoot,
                fromTarball, test, cookie);
        return rc;
     }
 
+    /* parse up the build operators */
+
+    printf("building these platforms: %s\n", buildplatforms);
+
     while((platform = strsep(&buildplatforms,",")) != NULL) {
        printf("building %s\n", platform);
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 8cde705..e9325d6 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -452,24 +452,6 @@ int rpmReadConfigFiles(char * file, char * arch, char * os, int building,
       RMIL_RPMRC);
 */
 
-/*
-Okay, I'm _not_ going to set these for now, since I think that buildarch
-and buildos should be set dynamically.  Gone are the days of having a
-build arch and os... they're all now just a platform.   I'm keeping it
-here until there's a discussion on the rpm mailing list.
-
-   - AdV
-*/
-
-
-#if 0 
-addMacro(&globalMacroContext, "_buildarch_lc", NULL, "mipseb", RMIL_RPMRC);
-       rpmGetOsInfo(&canonos, NULL);
-addMacro(&globalMacroContext, "_buildos", NULL, canonos, RMIL_RPMRC);
-addMacro(&globalMacroContext, "_buildos_lc", NULL, buf, RMIL_RPMRC);
-
-#endif
-
     if (rpmReadRC(file)) return -1;
 
     rpmRebuildPlatformVars(&buildplatform, &canonarch, &canonos);
@@ -484,8 +466,6 @@ buildos = (char *) getMacroBody(&globalMacroContext, "buildos");
 
 rpmSetMachine(buildarch,buildos);
 
-    
-
     return 0;
 }
 

diff --git a/macros.in b/macros.in
index 6a4db4a..9aead1b 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -30,7 +30,6 @@
 %__strip                 %(which strip)
 %__tar                   %(which tar)
 
-
 #==============================================================================
 # ---- rpmrc macros.
 #      Macros that are initialized as a side effect of rpmrc parsing.
@@ -38,10 +37,8 @@
 #      explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
 #
 %_buildarch            Unknown
-%_buildarch_lc         unknown
 %_builddir             %{_topdir}/BUILD
 %_buildos              Linux
-%_buildos_lc           linux
 %_bzip2bin             @BZIP2BIN@
 %_dbpath               %{_var}/lib/rpm
 %_defaultdocdir                %{_prefix}/doc

diff --git a/rpm.c b/rpm.c
index bef71b8..a2b362e 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -604,7 +604,7 @@ int main(int argc, char ** argv) {
     } 
 
     /* reading this early makes it easy to override */
-    if (rpmReadConfigFiles(rcfile, arch, os, building,NULL))  
+    if (rpmReadConfigFiles(rcfile, arch, os, building, NULL))  
        exit(1);
     if (showrc) {
        rpmShowRC(stdout);