From aee3a0de5666ef660abb36737cb3036827a51910 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Thu, 9 Feb 2012 13:44:11 -0800 Subject: [PATCH] Updated pip uninstall message to not scare people + add a fail message. --- devstack/pip.py | 5 +++-- devstack/utils.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/devstack/pip.py b/devstack/pip.py index 4752cbb6..5597bb6e 100644 --- a/devstack/pip.py +++ b/devstack/pip.py @@ -60,11 +60,12 @@ def uninstall(pips, distro, skip_errors=True): LOG.info("Uninstalling python packages (%s) using command (%s)" % (", ".join(pipnames), root_cmd)) for name in pipnames: try: - LOG.debug("Uninstall python package (%s)" % (name)) + LOG.debug("Uninstalling python package (%s)" % (name)) cmd = [root_cmd, 'uninstall'] + PIP_UNINSTALL_CMD_OPTS + [str(name)] sh.execute(*cmd, run_as_root=True) except excp.ProcessExecutionError: if skip_errors: - LOG.warn("Ignoring execution error that occured when uninstalling pip %s!" % (name)) + LOG.warn(("Ignoring execution error that occured when uninstalling pip %s!" + " (this may be ok if it was uninstalled by a previous component)") % (name)) else: raise diff --git a/devstack/utils.py b/devstack/utils.py index f8e5e5fc..a4d98795 100644 --- a/devstack/utils.py +++ b/devstack/utils.py @@ -500,6 +500,11 @@ def _goodbye_header(worked): | National Cheese | \ Emporium / ----------------- +''') + potential_fails.append(r''' + _______________________ +< You have been borked. > + ----------------------- ''') if not worked: msg = random.choice(potentials_fails).strip("\n\r")