Commit 1691a6c2 authored by Jim Fulton's avatar Jim Fulton

Adjust buildout script name for windows.

parent 4efeb9ce
...@@ -490,25 +490,16 @@ class Buildout(UserDict.DictMixin): ...@@ -490,25 +490,16 @@ class Buildout(UserDict.DictMixin):
if not upgraded: if not upgraded:
return return
if (realpath(os.path.abspath(sys.argv[0])) should_run = realpath(
!= os.path.join(os.path.abspath(self['buildout']['bin-directory']),
realpath( 'buildout')
os.path.join(os.path.abspath( )
self['buildout']['bin-directory'] if sys.platform == 'win32':
), should_run += '-script.py'
'buildout',
) if (realpath(os.path.abspath(sys.argv[0])) != should_run):
)
):
self._logger.debug("Running %r", realpath(sys.argv[0])) self._logger.debug("Running %r", realpath(sys.argv[0]))
self._logger.debug( self._logger.debug("Local buildout is %r", should_run)
"Local buildout is %r",
realpath(
os.path.join(
os.path.abspath(self['buildout']['bin-directory']),
'buildout')
)
)
self._logger.warn("Not upgrading because not running a local " self._logger.warn("Not upgrading because not running a local "
"buildout command") "buildout command")
return return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment