From d0676dbf7c64066c5166b194ef2591952e95a97a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 14 Mar 2018 14:05:47 -0700 Subject: [PATCH] Fix bug in prettyDiffEntry output It was not handling adding or removing modules correctly. --- src/composer/cli/recipes.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/composer/cli/recipes.py b/src/composer/cli/recipes.py index a1cf567e..b9a5e15a 100644 --- a/src/composer/cli/recipes.py +++ b/src/composer/cli/recipes.py @@ -223,9 +223,15 @@ def prettyDiffEntry(diff): else: return "Unknown" elif change(diff) == "Added": - return " ".join([diff["new"][k] for k in diff["new"]]) + if name(diff) in ["Module", "Package"]: + return "%s %s" % (diff["new"][name(diff)]["name"], diff["new"][name(diff)]["version"]) + else: + return " ".join([diff["new"][k] for k in diff["new"]]) elif change(diff) == "Removed": - return " ".join([diff["old"][k] for k in diff["old"]]) + if name(diff) in ["Module", "Package"]: + return "%s %s" % (diff["old"][name(diff)]["name"], diff["old"][name(diff)]["version"]) + else: + return " ".join([diff["old"][k] for k in diff["old"]]) return change(diff) + " " + name(diff) + " " + details(diff)