From 0b34cb4567d5711835ffd1b6dd5840d2f3c764b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 4 Sep 2015 11:09:40 +0200 Subject: [PATCH] - fix enable channel logic for given channel package --- osc/commandline.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 7e299f3e..52104ec0 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -478,19 +478,20 @@ class Osc(cmdln.Cmdln): channel = args[1] query = {'cmd': 'addchannels'} - if subcmd in ('enablechannels', 'enablechannel'): - query['cmd'] = 'enablechannel' + if opts.enable_all or subcmd in ('enablechannels', 'enablechannel'): + query['enable_all'] = '1' if channel is None: query['cmd'] = 'modifychannels' - query['enable_all'] = '1' - else: - if opts.enable_all and opts.skip_disabled: - raise oscerr.WrongOptions('--enable-all and --skip-disabled options are mutually exclusive') - elif opts.enable_all: - query['enable_all'] = '1' - elif opts.skip_disabled: - query['skip_disabled'] = '1' - + if channel: + query['cmd'] = 'enablechannel' + + if opts.enable_all and opts.skip_disabled: + raise oscerr.WrongOptions('--enable-all and --skip-disabled options are mutually exclusive') + elif opts.enable_all: + query['enable_all'] = '1' + elif opts.skip_disabled: + query['skip_disabled'] = '1' + print("Looking for channels...") url = makeurl(apiurl, ['source', project], query=query) if channel: