Commit bb2bca52 authored by Seblu's avatar Seblu
Browse files

fix bad object status displaying

parent 24512344

cccli/command.py

+18 −10
Original line number Diff line number Diff line
@@ -198,13 +198,16 @@ class RemoteCommand(OptionCommand): 
    def __init__(self, cli, argv0):

        OptionCommand.__init__(self, cli, argv0)

        # ignore tag option

        self.add_option("-I", "--ignore-tag", action="append", dest="ignore", default=[],

        self.add_option("-I", "--ignore-tag", action="append",

                        dest="ignore", default=[],

                        help="Don't display a tag in objects")

        # no print count at end option

        self.add_option("--no-count", action="store_true", dest="nocount",

        self.add_option("--no-count", action="store_true",

                        dest="nocount", default=False,

                        help="Don't print count at end of objects")

        # index printing

        self.add_option("-i", "--index", action="store_true", dest="index",

        self.add_option("-i", "--index", action="store_true",

                        dest="index", default=False,

                        help="Print object lines indexed")

        self.rpc = cli.rpc
@@ -258,13 +261,16 @@ class TqlCommand(RemoteCommand): 
                        callback=self._cb_raw,

                        help="Don't append security filter to TQL")

        # set tql check stuff

        self.add_option("-d", "--direct", action="store_true", dest="direct",

        self.add_option("-d", "--direct", action="store_true",

                        dest="direct", default=False,

                        help="Directly send TQL to server")

        # set tql status stuff

        self.add_option("-q", "--quiet", action="store_false", dest="status",

        self.add_option("-q", "--quiet", action="store_false",

                        dest="status", default=True,

                        help="Dont status of call request")

        # tql printer option

        self.add_option("--print-tql", action="store_true", dest="tql_print",

        self.add_option("--print-tql", action="store_true",

                        dest="tql_print", default=False,

                        help="Print TQL before sending to server")

        # set tagdisplay stuff

        self.tdr = self.cli.tagdisplay.resolve
@@ -349,8 +355,9 @@ class TqlCommand(RemoteCommand): 
                d = self.rpc.call(*args, **kwargs)

                if hasattr(self.options, "callback"):

                    self.options.callback(d)

                if self.options.status:

                    self.print_objects(d, ["output"])

                if hasattr(self.options, "status") and self.options.status:

                    self.options.ignore += [ "output" ]

                    self.print_objects(d)

            else:

                # arg_list mode call command for each argument

                # return is returned as a list
@@ -361,8 +368,9 @@ class TqlCommand(RemoteCommand): 
                    d.append(r)

                    if hasattr(self.options, "callback"):

                        self.options.callback(r)

                    if self.options.status:

                        self.print_objects(r, ["output"])

                    if hasattr(self.options, "status") and self.options.status:

                        self.options.ignore += [ "output" ]

                        self.print_objects(r)

            return d

        except RpcError as e:

            if hasattr(self.options, "exception"):