Commit 85a3807e authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fixup! drop zc.buildout version pinning in reboot() to prevent loop in case of version change.

parent 5f644a3a
...@@ -68,8 +68,6 @@ Buildout will be restarted automatically to have this change applied. ...@@ -68,8 +68,6 @@ Buildout will be restarted automatically to have this change applied.
running_python=self.running_python) running_python=self.running_python)
self.logger.info(message) self.logger.info(message)
args = map(zc.buildout.easy_install._safe_arg, sys.argv) args = map(zc.buildout.easy_install._safe_arg, sys.argv)
# drop zc.buildout version to prevent loop in case of version change
args = [x for x in args if not x.startswith('versions:zc.buildout=')]
env = os.environ env = os.environ
if 'ORIG_PYTHON' not in env: if 'ORIG_PYTHON' not in env:
env['ORIG_PYTHON'] = sys.executable env['ORIG_PYTHON'] = sys.executable
...@@ -106,8 +104,6 @@ Buildout will be restarted automatically to have this change applied. ...@@ -106,8 +104,6 @@ Buildout will be restarted automatically to have this change applied.
# rerun buildout with only neeeded section to reuse buildout # rerun buildout with only neeeded section to reuse buildout
# ability to calcuate all dependency # ability to calcuate all dependency
args.extend([ args.extend([
# use the last zc.buildout version that supports Python 2.6
'versions:zc.buildout=2.5.2+slapos005',
# chroot to rebootstrap directory # chroot to rebootstrap directory
'buildout:directory=%s' % self.rebootstrap_directory, 'buildout:directory=%s' % self.rebootstrap_directory,
# preserve bin-directory outside the chroot. # preserve bin-directory outside the chroot.
......
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