summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Bartosh <eduard.bartosh@intel.com>2015-01-16 11:23:44 +0200
committerEd Bartosh <eduard.bartosh@intel.com>2015-01-23 14:51:32 +0200
commit3e4ddd5152a55ebb54bf7a8abe9b8c4d6023d42c (patch)
treeb7e40be493fb477e8c4edd922652d00a65907c3d
parent3f442cb15a77c2dfe0f8f14b39f80dce58bf12b9 (diff)
downloadrepa-3e4ddd5152a55ebb54bf7a8abe9b8c4d6023d42c.tar.gz
repa-3e4ddd5152a55ebb54bf7a8abe9b8c4d6023d42c.tar.bz2
repa-3e4ddd5152a55ebb54bf7a8abe9b8c4d6023d42c.zip
group: removed --force option
The option was not used in the code and users don't complain, so let's remove it. Change-Id: I560cf4ec8210d41aa645883c7c82e1c97025096a Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
-rw-r--r--repa.16
-rwxr-xr-xrepa/group.py10
2 files changed, 4 insertions, 12 deletions
diff --git a/repa.1 b/repa.1
index cfaf86e..260b5bf 100644
--- a/repa.1
+++ b/repa.1
@@ -287,12 +287,6 @@ Add comment to created submit group. It will be shown by list command.
.RE
.PP
-\-f, \-\-force
-.RS 2
-Force group creation for submissions without binary packages. Useful when grouping failed submissions for rejection.
-.RE
-
-.PP
\--noaggregate <regexp>
.RS 2
Do not aggregate binary packages matching regexp. This is useful to skip aggregates, propagated by OBS from target project to prerlease projects, e.g. qemu-accel-*, mic-bootstrap, etc.
diff --git a/repa/group.py b/repa/group.py
index 6b69f4d..9f34f2d 100755
--- a/repa/group.py
+++ b/repa/group.py
@@ -67,7 +67,7 @@ def check_build_results(bresults):
# target project: for pkg, status in res['packages'] ...
-def check_binary_pkgs(obs, submissions, force=False, noaggregate=''):
+def check_binary_pkgs(obs, submissions, noaggregate=''):
"""
Check if submissions have common binary packages.
Check if binary packages exist.
@@ -152,7 +152,7 @@ def aggregate(obs, bresults, gproject, processes):
def group_submissions(obs, submissions, target, comment,
- force=False, processes=0, noaggregate=''):
+ processes=0, noaggregate=''):
"""Group multiple submissions into one group."""
# find correspondent prerelease projects
info = {}
@@ -170,7 +170,7 @@ def group_submissions(obs, submissions, target, comment,
check_build_results(bresults)
# filter out conflicting submissions
- filtered = check_binary_pkgs(obs, info, force, noaggregate)
+ filtered = check_binary_pkgs(obs, info, noaggregate)
bresults = [item for item in bresults if item[0] in filtered]
info = dict(item for item in info.iteritems() if item[0] in filtered)
@@ -201,8 +201,6 @@ class Group(object):
help='amount of parallel processes to use',
default=config.get('processes'))
parser.add_argument('-c', '--comment', help='comment', default='')
- parser.add_argument('-f', '--force', action='store_true',
- help='force group creation')
parser.add_argument('--noaggregate',
default=config.get('noaggregate', ''),
help='do not aggregate packages matching regexp')
@@ -212,7 +210,7 @@ class Group(object):
"""Command line entry point. Called from [sub_]main."""
obs = OBS(argv.apiurl, argv.apiuser, argv.apipasswd)
return group_submissions(obs, argv.submission, argv.project,
- argv.comment, argv.force, argv.processes,
+ argv.comment, argv.processes,
argv.noaggregate)