[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/buildout.py Adjust buildout script name for windows.

Jim Fulton jim at zope.com
Tue Dec 5 07:12:03 EST 2006


Log message for revision 71414:
  Adjust buildout script name for windows.
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/buildout.py

-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2006-12-05 12:11:14 UTC (rev 71413)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2006-12-05 12:12:02 UTC (rev 71414)
@@ -490,25 +490,16 @@
         if not upgraded:
             return
 
-        if (realpath(os.path.abspath(sys.argv[0]))
-            !=
-            realpath(
-                os.path.join(os.path.abspath(
-                                 self['buildout']['bin-directory']
-                                 ),
-                             'buildout',
-                             )
-                )
-            ):
+        should_run = realpath(
+            os.path.join(os.path.abspath(self['buildout']['bin-directory']),
+                         'buildout')
+            )
+        if sys.platform == 'win32':
+            should_run += '-script.py'
+
+        if (realpath(os.path.abspath(sys.argv[0])) != should_run):
             self._logger.debug("Running %r", realpath(sys.argv[0]))
-            self._logger.debug(
-                "Local buildout is %r",
-                realpath(
-                    os.path.join(
-                        os.path.abspath(self['buildout']['bin-directory']),
-                        'buildout')
-                    )
-                )
+            self._logger.debug("Local buildout is %r", should_run)
             self._logger.warn("Not upgrading because not running a local "
                               "buildout command")
             return



More information about the Checkins mailing list