Commit 79d15cb0 authored by Xiaowu Zhang's avatar Xiaowu Zhang

just to save

parent 5239a27d
......@@ -64,7 +64,11 @@ class Recipe(object):
log.debug("Updating hash with %s", option_signature)
self._debug_signature_text.append(option_signature)
# Or maybe warn and disable cache
assert buildout_directory not in option_signature
"""
if buildout_directory in option_signature:
raise NotImplementedError(type(buildout_directory), buildout_directory, option_signature, self.name)
assert buildout_directory not in option_signature
"""
m.update(option_signature)
shared = os.path.join(shared, m.hexdigest())
......@@ -120,8 +124,14 @@ class Recipe(object):
from copy import copy
for k, v in copy(options.items()):
if '@@LOCATION@@' in v:
options[k] = v.replace('@@LOCATION@@', default_location)
v = options[k] = v.replace('@@LOCATION@@', default_location)
if '@@HEAD_LOCATION@@' in v:
v = options[k] = v.replace('@@HEAD_LOCATION@@', os.path.split(default_location)[0])
if '@@TAIL_LOCATION@@' in v:
v = options[k] = v.replace('@@TAIL_LOCATION@@', os.path.split(default_location)[1])
log.info('****************** tail location key *********%s ' % k)
log.info('****************** tail location *********%s ' % options[k])
self.environ = {}
self.original_environment = os.environ.copy()
......@@ -328,6 +338,8 @@ class Recipe(object):
opt = self.options.copy()
opt['destination'] = compile_dir
opt['strip-top-level-dir'] = 'false'
# no need to shared build for compile dir
opt['shared'] = False
slapos.recipe.downloadunpacked.Recipe(
self.buildout, self.name, opt).install()
except:
......
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