mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-02 09:46:16 +01:00
Code

Unify obsolete warnings for commandline

Browse Source 
Signed-off-by: Sebastian Wagner <sebix@sebix.at>
This commit is contained in:
Sebastian Wagner 2016-05-15 17:50:31 +02:00
parent 8466e49d59
commit 61ddf8542e
No known key found for this signature in database
GPG Key ID: 19F45FEBDC9B463B
1 changed files with 82 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
osc/commandline.py
View File

@ -450,7 +450,7 @@ class Osc(cmdln.Cmdln):
def do_addchannels(self, subcmd, opts, *args): def do_addchannels(self, subcmd, opts, *args):
"""${cmd_name}: Add channels to project. """${cmd_name}: Add channels to project.
The command adds all channels which are defined to be used for a given source package. The command adds all channels which are defined to be used for a given source package.
The source link target is used to lookup the channels. The command can be The source link target is used to lookup the channels. The command can be
used for a certain package or for all in the specified project. used for a certain package or for all in the specified project.
@ -1703,7 +1703,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
apiurl = self.get_api_url() apiurl = self.get_api_url()
i = 0 i = 0
actionsxml = "" actionsxml = ""
supersede = [] supersede = []
@ -1779,8 +1779,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc requestmaintainership PROJECT PACKAGE # for current user osc requestmaintainership PROJECT PACKAGE # for current user
osc requestmaintainership PROJECT PACKAGE USER # request for specified user osc requestmaintainership PROJECT PACKAGE USER # request for specified user
osc requestmaintainership PROJECT PACKAGE group:NAME # request for specified group osc requestmaintainership PROJECT PACKAGE group:NAME # request for specified group
osc requestbugownership ... # accepts same parameters but uses bugowner role osc requestbugownership ... # accepts same parameters but uses bugowner role
${cmd_option_list} ${cmd_option_list}
""" """
@ -2296,7 +2296,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if cmd == 'approvenew': if cmd == 'approvenew':
print("\n *** Approve them all ? [y/n] ***") print("\n *** Approve them all ? [y/n] ***")
if sys.stdin.read(1) == "y": if sys.stdin.read(1) == "y":
if not opts.message: if not opts.message:
opts.message = edit_message() opts.message = edit_message()
for result in results: for result in results:
@ -2412,7 +2412,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if repl.lower() != 'y': if repl.lower() != 'y':
print('Aborted...', file=sys.stderr) print('Aborted...', file=sys.stderr)
raise oscerr.UserAbort() raise oscerr.UserAbort()
if not opts.message: if not opts.message:
tmpl = change_request_state_template(rq, state_map[cmd]) tmpl = change_request_state_template(rq, state_map[cmd])
opts.message = edit_message(template=tmpl) opts.message = edit_message(template=tmpl)
@ -2500,12 +2500,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
Obsolete command to edit metadata. Use 'meta' now. Obsolete command to edit metadata. Use 'meta' now.
See the help output of 'meta'. See the help output of 'meta'.
""" """
print('This command is obsolete. Use \'osc meta <metatype> ...\'.', file=sys.stderr) print("This command is obsolete. Use 'osc meta <metatype> ...'.", file=sys.stderr)
print('See \'osc help meta\'.', file=sys.stderr) print("See 'osc help meta'.", file=sys.stderr)
#self.do_help([None, 'meta'])
return 2 return 2
@ -2878,7 +2876,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
${cmd_option_list} ${cmd_option_list}
""" """
args = slash_split(args) args = slash_split(args)
apiurl = self.get_api_url() apiurl = self.get_api_url()
@ -2936,7 +2934,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
${cmd_option_list} ${cmd_option_list}
""" """
# FIXME: additional parameters can be a certain repo list to create a partitial release # FIXME: additional parameters can be a certain repo list to create a partitial release
args = slash_split(args) args = slash_split(args)
@ -3054,7 +3052,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc maintenancerequest [ SOURCEPROJECT [ SOURCEPACKAGES RELEASEPROJECT ] ] osc maintenancerequest [ SOURCEPROJECT [ SOURCEPACKAGES RELEASEPROJECT ] ]
osc maintenancerequest . osc maintenancerequest .
The 2nd line when issued within a package directory provides a short cut to submit a single The 2nd line when issued within a package directory provides a short cut to submit a single
package (the one in the current directory) from the project of this package to be submitted package (the one in the current directory) from the project of this package to be submitted
to the release project this package links to. This syntax is only valid when specified from to the release project this package links to. This syntax is only valid when specified from
a package subdirectory. a package subdirectory.
@ -3214,7 +3212,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
line+=" using sources from %s/%s"%(d.get('project'), d.get('package')) line+=" using sources from %s/%s"%(d.get('project'), d.get('package'))
print(line) print(line)
return return
apiopt = '' apiopt = ''
if conf.get_configParser().get('general', 'apiurl') != apiurl: if conf.get_configParser().get('general', 'apiurl') != apiurl:
apiopt = '-A %s ' % apiurl apiopt = '-A %s ' % apiurl
@ -3309,7 +3307,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print('defaulting to %s/%s' % (def_p, args[0]), file=sys.stderr) print('defaulting to %s/%s' % (def_p, args[0]), file=sys.stderr)
# python has no args.unshift ??? # python has no args.unshift ???
args = [ def_p, args[0] ] args = [ def_p, args[0] ]
if len(args) == 0 and is_package_dir('.'): if len(args) == 0 and is_package_dir('.'):
args = (store_read_project('.'), store_read_package('.')) args = (store_read_project('.'), store_read_package('.'))
@ -3355,7 +3353,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
missingok=False, missingok=False,
maintenance=opts.maintenance, maintenance=opts.maintenance,
newinstance=opts.new_package) newinstance=opts.new_package)
if exists: if exists:
print('Using existing branch project: %s' % targetprj, file=sys.stderr) print('Using existing branch project: %s' % targetprj, file=sys.stderr)
@ -3570,25 +3568,36 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.hide(1) @cmdln.hide(1)
def do_deletepac(self, subcmd, opts, *args): def do_deletepac(self, subcmd, opts, *args):
print("""${cmd_name} is obsolete ! """${cmd_name}:
Obsolete command to delete package. Use 'delete' or 'rdelete' now.
See the help output of 'delete' and 'rdelete'.
"""
print("""Command deletepac is obsolete !
Please use either Please use either
osc delete for checked out packages or projects osc delete for checked out packages or projects
or or
osc rdelete for server side operations.""") osc rdelete for server side operations.""", file=sys.stderr)
sys.exit(1) return 2
@cmdln.hide(1) @cmdln.hide(1)
@cmdln.option('-f', '--force', action='store_true', @cmdln.option('-f', '--force', action='store_true',
help='deletes a project and its packages') help='deletes a project and its packages')
def do_deleteprj(self, subcmd, opts, project): def do_deleteprj(self, subcmd, opts, project):
"""${cmd_name} is obsolete ! """${cmd_name}:
Please use Obsolete command to delete project. Use 'rdelete' now.
osc rdelete PROJECT
See the help output of 'rdelete'.
""" """
sys.exit(1)
print("This command is obsolete. Use 'osc rdelete <project>'.", file=sys.stderr)
print("See 'osc help rdelete'.", file=sys.stderr)
return 2
@cmdln.alias('metafromspec') @cmdln.alias('metafromspec')
@cmdln.alias('updatepkgmetafromspec') @cmdln.alias('updatepkgmetafromspec')
@ -3655,7 +3664,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if (subcmd == 'ldiff' or subcmd == 'linkdiff'): if (subcmd == 'ldiff' or subcmd == 'linkdiff'):
opts.link = True opts.link = True
args = parseargs(args) args = parseargs(args)
pacs = None pacs = None
if not opts.link or not len(args) == 2: if not opts.link or not len(args) == 2:
pacs = findpacs(args) pacs = findpacs(args)
@ -4186,7 +4195,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
while inside a project directory: while inside a project directory:
osc co PACKAGE # check out PACKAGE from project osc co PACKAGE # check out PACKAGE from project
with the result of rpm -q --qf '%%{DISTURL}\\n' PACKAGE with the result of rpm -q --qf '%%{DISTURL}\\n' PACKAGE
osc co obs://API/PROJECT/PLATFORM/REVISION-PACKAGE osc co obs://API/PROJECT/PLATFORM/REVISION-PACKAGE
@ -4863,8 +4872,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.hide(1) @cmdln.hide(1)
def do_results_meta(self, subcmd, opts, *args): def do_results_meta(self, subcmd, opts, *args):
print("Command results_meta is obsolete. Please use: osc results --xml") """${cmd_name}:
sys.exit(1)
Obsolete command to show build results. Use 'results --xml' now.
See the help output of 'results'.
"""
print("This command is obsolete. Use 'osc results --xml'.",
file=sys.stderr)
print("See 'osc help results'.", file=sys.stderr)
return 2
@cmdln.hide(1) @cmdln.hide(1)
@cmdln.option('-l', '--last-build', action='store_true', @cmdln.option('-l', '--last-build', action='store_true',
@ -4876,10 +4894,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('', '--xml', action='store_true', @cmdln.option('', '--xml', action='store_true',
help='generate output in XML (former results_meta)') help='generate output in XML (former results_meta)')
def do_rresults(self, subcmd, opts, *args): def do_rresults(self, subcmd, opts, *args):
print("Command rresults is obsolete. Running 'osc results' instead") """${cmd_name}:
self.do_results('results', opts, *args)
sys.exit(1)
Obsolete command to show build results. Use 'results' now.
See the help output of 'results'.
"""
print("Command rresults is obsolete. Running 'osc results' instead",
file=sys.stderr)
print("See 'osc help results'.", file=sys.stderr)
return self.do_results('results', opts, *args)
@cmdln.option('-f', '--force', action='store_true', default=False, @cmdln.option('-f', '--force', action='store_true', default=False,
help="Don't ask and delete files") help="Don't ask and delete files")
@ -5061,8 +5086,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.hide(1) @cmdln.hide(1)
def do_rprjresults(self, subcmd, opts, *args): def do_rprjresults(self, subcmd, opts, *args):
print("Command rprjresults is obsolete. Please use 'osc prjresults'") """${cmd_name}:
sys.exit(1)
Obsolete command to show project-wide build results. Use 'prjresults' now.
See the help output of 'prjresults'.
"""
print("Command rprjresults is obsolete. Please use 'osc prjresults'",
file=sys.stderr)
print("See 'osc help prjresults'.", file=sys.stderr)
return 2
@cmdln.alias('bl') @cmdln.alias('bl')
@cmdln.alias('blt') @cmdln.alias('blt')
@ -5318,7 +5352,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(args) < 2: if len(args) < 2:
self.print_repos() self.print_repos()
apiurl = self.get_api_url() apiurl = self.get_api_url()
if len(args) == 2: # 2 if len(args) == 2: # 2
@ -5596,7 +5630,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for repo in get_repos_of_project(apiurl, project): for repo in get_repos_of_project(apiurl, project):
if (disabled is None) or ((disabled is not None) and (repo.name not in disabled)): if (disabled is None) or ((disabled is not None) and (repo.name not in disabled)):
data += [repo.name, repo.arch] data += [repo.name, repo.arch]
for row in build_table(2, data, width=2): for row in build_table(2, data, width=2):
print(row) print(row)
@ -5673,7 +5707,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# reduce(lambda x, y: x + y, (glob.glob(x) for x in ('*.spec', '*.dsc', '*.kiwi'))) # reduce(lambda x, y: x + y, (glob.glob(x) for x in ('*.spec', '*.dsc', '*.kiwi')))
# but be a bit more readable :) # but be a bit more readable :)
descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi') + glob.glob('*.livebuild') + glob.glob('PKGBUILD') + glob.glob('build.collax') descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi') + glob.glob('*.livebuild') + glob.glob('PKGBUILD') + glob.glob('build.collax')
# FIXME: # FIXME:
# * request repos from server and select by build type. # * request repos from server and select by build type.
if not arg_descr and len(descr) == 1: if not arg_descr and len(descr) == 1:
@ -5862,7 +5896,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
except: except:
print("WARNING: package is not existing on server yet") print("WARNING: package is not existing on server yet")
opts.local_package = True opts.local_package = True
if opts.offline or opts.local_package or r == None: if opts.offline or opts.local_package or r == None:
print("WARNING: source service from package or project will not be executed. This may not be the same build as on server!") print("WARNING: source service from package or project will not be executed. This may not be the same build as on server!")
elif (conf.config['local_service_run'] and not opts.noservice) and not opts.noinit: elif (conf.config['local_service_run'] and not opts.noservice) and not opts.noinit:
@ -5938,7 +5972,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
return ret return ret
return 0 return 0
cwd = os.getcwd() cwd = os.getcwd()
basename = os.path.basename(cwd) basename = os.path.basename(cwd)
@ -6191,8 +6225,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.hide(1) @cmdln.hide(1)
def do_rlog(self, subcmd, opts, *args): def do_rlog(self, subcmd, opts, *args):
print("Command rlog is obsolete. Please use 'osc log'") """${cmd_name}:
sys.exit(1)
Obsolete command to show commit logs. Use 'log' now.
See the help output of 'log'.
"""
print("This command is obsolete. Use 'osc log'.", file=sys.stderr)
print("See 'osc help log'.", file=sys.stderr)
return 2
@cmdln.option('-r', '--revision', metavar='rev', @cmdln.option('-r', '--revision', metavar='rev',
@ -7364,7 +7406,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc maintainer <options> osc maintainer <options>
osc maintainer PRJ <options> osc maintainer PRJ <options>
osc maintainer PRJ PKG <options> osc maintainer PRJ PKG <options>
The tool looks up the default responsible person for a certain project or package. The tool looks up the default responsible person for a certain project or package.
When using with an OBS 2.4 (or later) server it is doing the lookup for When using with an OBS 2.4 (or later) server it is doing the lookup for
a given binary according to the server side configuration of default owners. a given binary according to the server side configuration of default owners.