From d489321fb2b128970689c448703ccc9961cd79b2 Mon Sep 17 00:00:00 2001
From: Sebastien Luttringer <sebastien.luttringer@smartjog.com>
Date: Tue, 18 Oct 2011 16:23:17 +0200
Subject: [PATCH] is list display changelog only with -c or -v option
---
bin/is | 6 ++++--
installsystems/image.py | 11 ++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/bin/is b/bin/is
index 3dbe0c1..bba274d 100755
--- a/bin/is
+++ b/bin/is
@@ -237,10 +237,10 @@ def c_list(parser, args):
if len(repos) > 0:
for reponame in repos:
arrow(reponame)
- repoman[reponame].show(verbose=args.verbose)
+ repoman[reponame].show(verbose=args.verbose, changelog=args.changelog)
else:
img, repo = select_image(o, repoman, args.best)
- img.show(verbose=args.verbose)
+ img.show(verbose=args.verbose, changelog=args.changelog)
def c_move(parser, args):
'''
@@ -429,6 +429,8 @@ p_list.add_argument("-v", action="store_true", dest="verbose", default=False,
help="verbose output")
p_list.add_argument("-b", "--best", action="store_true", default=False,
help="in best mode, image is the most recent in all repositories")
+p_list.add_argument("-c", "--changelog", action="store_true", default=False,
+ help="display image changelog")
p_list.add_argument("object", nargs="*",
help="object syntax is <path|repository|[repository/]image[:version]>")
p_list.set_defaults(func=c_list, subparser=p_list)
diff --git a/installsystems/image.py b/installsystems/image.py
index 66eba2a..9c465dc 100644
--- a/installsystems/image.py
+++ b/installsystems/image.py
@@ -517,7 +517,7 @@ class PackageImage(Image):
warn("Invalid changelog: %s" % e)
return desc
- def show(self, verbose=False):
+ def show(self, verbose=False, changelog=False):
'''
Display image content
'''
@@ -544,10 +544,11 @@ class PackageImage(Image):
out('#light##yellow#Content:#reset#')
self._tarball.list(verbose)
# display changelog
- try:
- self.changelog.show(int(self.version), verbose)
- except AttributeError:
- pass
+ if changelog or verbose:
+ try:
+ self.changelog.show(int(self.version), verbose)
+ except AttributeError:
+ pass
def check(self, message="Check MD5"):
'''
--
GitLab