Can't use the config.PYVER value if it hasn't been set yet...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index e60a899127f0f5927d0633d879332a6a557b113f..24f66ead48a8b412fa7c8399093ec76c6c38e4b3 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -102,7 +102,7 @@ jaguarTask =  Task( Job(config.OSX_HOST_jaguar,
 pantherTask =  Task( Job(config.OSX_HOST_panther,
                          ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther"]) )
 
-rpmTask = Task([ Job("co-rh9",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   config.PYVER]),
+rpmTask = Task([ Job("co-rh9",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "config"]),
                  Job("co-fc2",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.3"]),
                  Job("co-mdk92",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
                  Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
@@ -115,7 +115,7 @@ buildTasks = [ windowsTask,
                ]
 
 # Finalization.  This is for things that must wait until all the
-# builds are done, such as copying the isntallers someplace, sending
+# builds are done, such as copying the installers someplace, sending
 # emails, etc.
 finalizationTask = Task( Job("", ["distrib/all/build-finalize", CFGFILE]) )
 

diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm
index 89b13e1e87e2a55e22d08227fdb3e8350ce93821..f53be94cdcb8d80062a500e95705f927bf3069a2 100755 (executable)
--- a/wxPython/distrib/all/build-rpm
+++ b/wxPython/distrib/all/build-rpm
@@ -12,6 +12,10 @@ reltag=$4
 shift;shift;shift;shift
 pyver=$@
 
+if [ $pyver = config ]; then
+    pyver=$PYVER
+fi
+
 
 function TestOnline {
     local host=$1