Исправлена подготовка сборки

Проблема инвалидации cl_builder_target
3.4.1.4
Mike Khiretskiy 9 years ago
parent 14d238c3f4
commit a4aaf6358b

@ -378,7 +378,7 @@ class VariableClBuilderLayeredSet(Variable):
Проверить возможность ядра использовать overlay fs
"""
return (
self.kernel_opt in self.Get('install.os_install_kernel_config'))
self.kernel_opt in self.Get('install.os_kernel_config'))
def get(self):
try:
@ -429,7 +429,6 @@ class VariableClBuilderTarget(Variable):
builder_disk_dev = self.Get('cl_builder_disk_dev')
if not builder_disk_dev:
return ""
build_id = self.Get('cl_builder_id')
build_id_path = self.Get('cl_builder_id_path')
mount_dir = path.join(distr.DefaultMountPath.BaseMountPath,
build_id_path)

@ -34,10 +34,15 @@ class VariableClBuilderProfileStorage(ReadonlyVariable):
def get(self):
builder_path = self.Get('cl_builder_path')
builder_ls = path.join(builder_path, "var/lib/layman")
return update_profile.RepositoryStorageSet(
update_profile.LocalStorage(builder_ls),
update_profile.CacheStorage('/var/calculate/tmp/update'))
if builder_path:
builder_ls = path.join(builder_path, "var/lib/layman")
return update_profile.RepositoryStorageSet(
update_profile.LocalStorage(builder_ls),
update_profile.CacheStorage('/var/calculate/tmp/update'))
else:
return update_profile.RepositoryStorageSet(
update_profile.CacheStorage('/var/calculate/tmp/update'))
class VariableClBuilderProfileUrl(update.VariableClUpdateProfileUrl):

Loading…
Cancel
Save