x/anvil
Code Issues Proposed changes

Fixed source components.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-27 22:13:07 -08:00
parent 1a808825d2
commit 4df24e3668
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/progs/actions.py
View File

@ -310,32 +310,28 @@ def _dump_cfgs(config_obj, action):
def run(args): def run(args):
(distro, platform) = utils.determine_distro() (distro, platform) = utils.determine_distro()
if distro is None: if distro is None:
print("Unsupported platform " + utils.color_text(platform, "red") + "!") print("Unsupported platform " + utils.color_text(platform, "red") + "!")
return False return False
action = args.pop("action", "").strip().lower() action = args.pop("action", "").strip().lower()
if not (action in settings.ACTIONS): if not (action in settings.ACTIONS):
print(utils.color_text("No valid action specified!", "red")) print(utils.color_text("No valid action specified!", "red"))
return False return False
rootdir = args.pop("dir") rootdir = args.pop("dir")
if not rootdir: if not rootdir:
print(utils.color_text("No root directory specified!", "red")) print(utils.color_text("No root directory specified!", "red"))
return False return False
(rep, maxlen) = utils.welcome(_WELCOME_MAP.get(action)) (rep, maxlen) = utils.welcome(_WELCOME_MAP.get(action))
print(utils.center_text("Action Runner", rep, maxlen)) print(utils.center_text("Action Runner", rep, maxlen))
#here on out we should be using the logger (and not print)
start_time = time.time() start_time = time.time()
config = common.get_config() config = common.get_config()
pkg_manager = common.get_packager(distro, args.pop('keep_packages', True)) pkg_manager = common.get_packager(distro, args.pop('keep_packages', True))
runner = ActionRunner(distro, action, rootdir, config, pkg_manager, **args) components = utils.parse_components(args.pop("components"))
runner = ActionRunner(distro, action, rootdir, config, pkg_manager, components=components, **args)
LOG.info("Starting action [%s] on %s for distro [%s]" % (action, date.rcf8222date(), distro)) LOG.info("Starting action [%s] on %s for distro [%s]" % (action, date.rcf8222date(), distro))
runner.run() runner.run()
LOG.info("It took (%s) to complete action [%s]" % (common.format_secs_taken((time.time() - start_time)), action)) LOG.info("It took (%s) to complete action [%s]" % (common.format_secs_taken((time.time() - start_time)), action))
_dump_cfgs(config, action) _dump_cfgs(config, action)
return True return True