From ba1d77fa10831a159cac75443a248e48ea7194ce Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 8 Apr 2014 12:02:39 +0200 Subject: [PATCH] [eit.commands] add --quick support to eit {mv,cp} This avoids interactivity --- server/eit/commands/cp.py | 19 ++++++++++++++----- server/eit/commands/mv.py | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/eit/commands/cp.py b/server/eit/commands/cp.py index b775eee1f..82c3b41d5 100644 --- a/server/eit/commands/cp.py +++ b/server/eit/commands/cp.py @@ -33,6 +33,7 @@ class EitCp(EitCommand): self._source = None self._dest = None self._deps = False + self._ask = True self._packages = [] self._copy = True # execute package name and slot updates @@ -60,6 +61,9 @@ class EitCp(EitCommand): parser.add_argument("--deps", action="store_true", default=False, help=_("include dependencies")) + parser.add_argument("--quick", action="store_true", + default=not self._ask, + help=_("no stupid questions")) parser.add_argument("packages", nargs='+', metavar="", help=_("package dependency")) return parser @@ -81,7 +85,7 @@ class EitCp(EitCommand): # already given a repo outcome = [] break - outcome += ["--deps", "--conservative"] + outcome += ["--deps", "--conservative", "--quick"] def _startswith(string): if last_arg is not None: @@ -123,6 +127,7 @@ Copy packages from source repository to destination repository. self._source = nsargs.source[0] self._dest = nsargs.dest[0] self._deps = nsargs.deps + self._ask = not nsargs.quick self._packages += nsargs.packages self._entropy_class()._inhibit_treeupdates = nsargs.conservative @@ -183,11 +188,15 @@ Copy packages from source repository to destination repository. rc = False if self._copy: - rc = entropy_server.copy_packages(package_ids, self._source, - self._dest, pull_dependencies = self._deps) + rc = entropy_server.copy_packages( + package_ids, self._source, + self._dest, pull_dependencies = self._deps, + ask = self._ask) else: - rc = entropy_server.move_packages(package_ids, self._source, - self._dest, pull_dependencies = self._deps) + rc = entropy_server.move_packages( + package_ids, self._source, + self._dest, pull_dependencies = self._deps, + ask = self._ask) if rc: return 0 return 1 diff --git a/server/eit/commands/mv.py b/server/eit/commands/mv.py index e5ca4efa4..25b1c3db2 100644 --- a/server/eit/commands/mv.py +++ b/server/eit/commands/mv.py @@ -51,6 +51,7 @@ then is removed from source. self._source = nsargs.source self._dest = nsargs.dest self._deps = nsargs.deps + self._ask = not nsargs.quick self._packages += nsargs.packages self._copy = False self._entropy_class()._inhibit_treeupdates = nsargs.conservative