[Zope-Checkins] SVN: Zope/branches/slinkp-configure_changes/configure - No longer try to execute directories.

Paul Winkler pw_lists at slinkp.com
Sat Nov 12 13:43:46 EST 2005


Log message for revision 40075:
  - No longer try to execute directories.
  

Changed:
  U   Zope/branches/slinkp-configure_changes/configure

-=-
Modified: Zope/branches/slinkp-configure_changes/configure
===================================================================
--- Zope/branches/slinkp-configure_changes/configure	2005-11-12 18:29:16 UTC (rev 40074)
+++ Zope/branches/slinkp-configure_changes/configure	2005-11-12 18:43:46 UTC (rev 40075)
@@ -77,7 +77,7 @@
         IFS="$OLDIFS"
         for EXECUTABLE in $EXENAMES; do
             FULL="$DIR/$EXECUTABLE"
-            if [ -x "$FULL" ]; then
+            if [ -x "$FULL" -a ! -d "$FULL" ]; then
                 CMD="import string,sys;a=string.split(sys.version)[0]"
 		# Strip trailing + from version number
 		CMD="$CMD;a=(a[-1]=='+')and(a[:-1])or(a);print a"
@@ -86,7 +86,6 @@
 		i=0;
                 for P in $PREFERRED; do
 		    i=`expr $i + 1`
-		    echo "XXX I: $i"
 		    for SLOT in $PREF_FOUNDLIST; do
 			if [ $SLOT -eq $i ]; then
                             # slot "i" already populated.  
@@ -110,7 +109,6 @@
                     i=0;
                     for ACC in $ACCEPTABLE; do
                         i=`expr $i + 1`
-			echo "I XXX $i"
 			for SLOT in $FOUNDLIST; do
                             if [ $SLOT -eq $i ]; then
                                 # slot "i" already populated.  This means we've



More information about the Zope-Checkins mailing list