Commit d489321f authored by Sebastien Luttringer's avatar Sebastien Luttringer
Browse files

is list display changelog only with -c or -v option

parent 85f07b46

bin/is

+4 −2
Original line number Diff line number Diff line
@@ -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)

installsystems/image.py

+6 −5
Original line number Diff line number Diff line
@@ -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,6 +544,7 @@ class PackageImage(Image): 
        out('#light##yellow#Content:#reset#')

        self._tarball.list(verbose)

        # display changelog

        if changelog or verbose:

            try:

                self.changelog.show(int(self.version), verbose)

            except AttributeError: