x/anvil
Code Issues Proposed changes

Cleanup template usage + tgt link creation fix when empty

Browse Source
This commit is contained in:
harlowja 2012-08-25 09:58:42 -07:00
parent 9353c71bae
commit de9bb1ae8b
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anvil/components/__init__.py
View File

@ -553,7 +553,7 @@ class PythonRuntime(ProgramRuntime):
app_dir = app_info.get("app_dir", self.get_option('app_dir'))
app_options = self.app_options(app_name)
app_params = self.app_params(app_name)
program_opts = [utils.expand_template(str(c), app_params) for c in app_options]
program_opts = [utils.expand_template(c, app_params) for c in app_options]
LOG.debug("Starting %r using %r", app_name, starter)
details_fn = starter.start(app_name, app_pth=app_pth, app_dir=app_dir, opts=program_opts)
LOG.info("Started sub-program %s.", colorizer.quote(app_name))

2
anvil/distros/rhel.py
View File

@ -192,6 +192,8 @@ class YumPackagerWithRelinks(yum.YumPackager):
continue
src = glob.glob(src)
tgt = glob.glob(tgt)
if not tgt:
tgt = [entry.get('target')]
if len(src) != len(tgt):
raise RuntimeError("Unable to link %s sources to %s locations" % (len(src), len(tgt)))
for i in range(len(src)):

16
anvil/utils.py
View File

@ -71,11 +71,11 @@ LOG = logging.getLogger(__name__)
def expand_template(contents, params):
if not params:
params = {}
return Template(contents, searchList=[params]).respond()
return Template(str(contents), searchList=[params]).respond()
def load_yaml(fn):
return yaml.safe_load(sh.load_file(fn))
return load_yaml_text(sh.load_file(fn))
def load_yaml_text(text):
@ -162,13 +162,13 @@ def execute_template(cmd, *cmds, **kargs):
run_what_tpl = info["cmd"]
if not isinstance(run_what_tpl, (list, tuple, set)):
run_what_tpl = [run_what_tpl]
run_what = [expand_template(str(c), params) for c in run_what_tpl]
run_what = [expand_template(c, params) for c in run_what_tpl]
stdin = None
stdin_tpl = info.get('stdin')
if stdin_tpl:
if not isinstance(stdin_tpl, (list, tuple, set)):
stdin_tpl = [stdin_tpl]
stdin = [expand_template(str(c), params) for c in stdin_tpl]
stdin = [expand_template(c, params) for c in stdin_tpl]
stdin = "\n".join(stdin)
result = sh.execute(*run_what,
run_as_root=info.get('run_as_root', False),
@ -322,9 +322,9 @@ def chdir(where_to):
def get_interfaces():
interfaces = dict()
interfaces = {}
for intfc in netifaces.interfaces():
interface_info = dict()
interface_info = {}
interface_addresses = netifaces.ifaddresses(intfc)
ip6 = interface_addresses.get(netifaces.AF_INET6)
if ip6:
@ -350,10 +350,6 @@ def joinlinesep(*pieces):
return os.linesep.join(pieces)
def get_class_names(objects):
return map((lambda i: i.__class__.__name__), objects)
def prettify_yaml(obj):
formatted = yaml.dump(obj,
line_break="\n",