From 8f8f58bb41a15d660ced8b58b8da7dc53b008b31 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 8 Apr 2014 11:54:59 +0200 Subject: [PATCH] [eit.commands] remove _get_parser() from EitMv, it's shared with EitCp --- server/eit/commands/cp.py | 8 ++++---- server/eit/commands/mv.py | 26 -------------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/server/eit/commands/cp.py b/server/eit/commands/cp.py index e8356b951..b775eee1f 100644 --- a/server/eit/commands/cp.py +++ b/server/eit/commands/cp.py @@ -41,11 +41,11 @@ class EitCp(EitCommand): def _get_parser(self): """ Overridden from EitCp """ descriptor = EitCommandDescriptor.obtain_descriptor( - EitCp.NAME) + self.NAME) parser = argparse.ArgumentParser( description=descriptor.get_description(), formatter_class=argparse.RawDescriptionHelpFormatter, - prog="%s %s" % (sys.argv[0], EitCp.NAME)) + prog="%s %s" % (sys.argv[0], self.NAME)) parser.add_argument("source", nargs=1, metavar="", @@ -60,7 +60,7 @@ class EitCp(EitCommand): parser.add_argument("--deps", action="store_true", default=False, help=_("include dependencies")) - parser.add_argument("package", nargs='+', metavar="", + parser.add_argument("packages", nargs='+', metavar="", help=_("package dependency")) return parser @@ -123,7 +123,7 @@ Copy packages from source repository to destination repository. self._source = nsargs.source[0] self._dest = nsargs.dest[0] self._deps = nsargs.deps - self._packages += nsargs.package + self._packages += nsargs.packages self._entropy_class()._inhibit_treeupdates = nsargs.conservative return self._call_exclusive, [self._move_copy, self._source] diff --git a/server/eit/commands/mv.py b/server/eit/commands/mv.py index 793e7b93b..e5ca4efa4 100644 --- a/server/eit/commands/mv.py +++ b/server/eit/commands/mv.py @@ -27,32 +27,6 @@ class EitMv(EitCp): NAME = "mv" ALIASES = [] - def _get_parser(self): - """ Overridden from EitMv """ - descriptor = EitCommandDescriptor.obtain_descriptor( - EitMv.NAME) - parser = argparse.ArgumentParser( - description=descriptor.get_description(), - formatter_class=argparse.RawDescriptionHelpFormatter, - prog="%s %s" % (sys.argv[0], EitMv.NAME)) - - parser.add_argument("source", metavar="", - help=_("source repository")) - parser.add_argument("dest", metavar="", - help=_("destination repository")) - parser.add_argument("--conservative", action="store_true", - help=_("do not execute implicit package name " - "and slot updates"), - default=self._conservative) - parser.add_argument("--deps", action="store_true", - default=False, - help=_("include dependencies")) - parser.add_argument("packages", nargs='*', metavar="", - help=_("package names (all if none)"), - default=None) - - return parser - INTRODUCTION = """\ Move packages from source repository to destination repository. The operation is transactional, first package is copied to destination,