Commit 282a652f authored by Łukasz Nowak's avatar Łukasz Nowak

Fixup ddd77222

utils module is imported, not just one method.
parent d8649c08
...@@ -71,7 +71,8 @@ class Software(object): ...@@ -71,7 +71,8 @@ class Software(object):
""" """
self.logger.info("Installing software release %s..." % self.url) self.logger.info("Installing software release %s..." % self.url)
root_stat_info = os.stat(self.software_root) root_stat_info = os.stat(self.software_root)
os.environ = getCleanEnvironment(pwd.getpwuid(root_stat_info.st_uid).pw_dir) os.environ = utils.getCleanEnvironment(pwd.getpwuid(root_stat_info.st_uid
).pw_dir)
if not os.path.isdir(self.software_path): if not os.path.isdir(self.software_path):
os.mkdir(self.software_path) os.mkdir(self.software_path)
extends_cache = tempfile.mkdtemp() extends_cache = tempfile.mkdtemp()
...@@ -209,7 +210,8 @@ class Partition(object): ...@@ -209,7 +210,8 @@ class Partition(object):
'are %s' % 'are %s' %
(self.instance_path, permission, (self.instance_path, permission,
REQUIRED_COMPUTER_PARTITION_PERMISSION)) REQUIRED_COMPUTER_PARTITION_PERMISSION))
os.environ = getCleanEnvironment(pwd.getpwuid(instance_stat_info.st_uid).pw_dir) os.environ = utils.getCleanEnvironment(pwd.getpwuid(
instance_stat_info.st_uid).pw_dir)
# Generates buildout part from template # Generates buildout part from template
# TODO how to fetch the good template? Naming conventions? # TODO how to fetch the good template? Naming conventions?
template_location = os.path.join(self.software_path, 'template.cfg') template_location = os.path.join(self.software_path, 'template.cfg')
......
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