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

do_branch: allow slash notation for the project/package arguments (as requested by darix)

Browse Source
This commit is contained in:
Marcus Hüwe 2008-10-16 12:34:41 +00:00
parent 16d47f03b5
commit ccda32cca2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/commandline.py
View File

@ -812,7 +812,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('--nodevelproject', action='store_true', @cmdln.option('--nodevelproject', action='store_true',
help='do not follow a defined devel project ' \ help='do not follow a defined devel project ' \
'(primary project where a package is developed)') '(primary project where a package is developed)')
def do_branch(self, subcmd, opts, prj, pkg): def do_branch(self, subcmd, opts, *args):
"""${cmd_name}: Branch a package """${cmd_name}: Branch a package
[See http://en.opensuse.org/Build_Service/Collaboration for information [See http://en.opensuse.org/Build_Service/Collaboration for information
@ -829,9 +829,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
${cmd_option_list} ${cmd_option_list}
""" """
r = branch_pkg(conf.config['apiurl'], prj, pkg, nodevelproject=opts.nodevelproject) args = slash_split(args)
if len(args) != 2:
raise oscerr.WrongArgs('Wrong number of arguments.')
expected = 'home:%s:branches:%s' % (conf.config['user'], prj) r = branch_pkg(conf.config['apiurl'], args[0], args[1], nodevelproject=opts.nodevelproject)
expected = 'home:%s:branches:%s' % (conf.config['user'], args[0])
if r != expected: if r != expected:
devloc = r.split('branches:')[1] devloc = r.split('branches:')[1]
print '\nNote: The branch has been created of a different project,\n' \ print '\nNote: The branch has been created of a different project,\n' \
@ -844,7 +848,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print 'A working copy of the branched package can be checked out with:\n\n' \ print 'A working copy of the branched package can be checked out with:\n\n' \
'osc co %s/%s' \ 'osc co %s/%s' \
% (r, pkg) % (r, args[1])
def do_deletepac(self, subcmd, opts, *args): def do_deletepac(self, subcmd, opts, *args):