Added GetCount, GetCountRGB, and GetCountColour methods to

[wxWidgets.git] / wxPython / distrib / all / build-rpm

diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm
index 89b13e1e87e2a55e22d08227fdb3e8350ce93821..66e9afaed7ba785b8d768eb95b9276899ea2fb83 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=$@
 
 shift;shift;shift;shift
 pyver=$@
 

+if [ $pyver = config ]; then
+    pyver=$PYVER
+fi
+

 
 function TestOnline {
     local host=$1
 
 function TestOnline {
     local host=$1


@@ -35,14 +39,14 @@ if [ $skiplinux != yes ]; then
        hostAvailable=yes
     else
        # Attempt to start the host via it's coLinux host, if there is one
        hostAvailable=yes
     else
        # Attempt to start the host via it's coLinux host, if there is one

-       if [ $coHost != none ]; then 
+       if [ $coHost != none -a $startcohost == yes ]; then 

            if TestOnline $coHost; then
                echo "Attempting to start $host via coLinux on $coHost..."
                ssh $coHost "/c/coLinux/VMs/$host.bat -d > /dev/null 2>&1 &"
 
                # Give it time to boot and be ready for conenctions,
                # and then test with ssh, limiting retries.
            if TestOnline $coHost; then
                echo "Attempting to start $host via coLinux on $coHost..."
                ssh $coHost "/c/coLinux/VMs/$host.bat -d > /dev/null 2>&1 &"
 
                # Give it time to boot and be ready for conenctions,
                # and then test with ssh, limiting retries.

-               for x in `seq 12`; do
+               for x in `seq 36`; do

                    sleep 5
                    echo "checking..."
                    if ssh root@$host "true" >/dev/null 2>&1; then
                    sleep 5
                    echo "checking..."
                    if ssh root@$host "true" >/dev/null 2>&1; then