From 633fd2c10f621ea6ab08825dc423462694fe7d48 Mon Sep 17 00:00:00 2001 From: "Dr. Peter Poeml" Date: Wed, 25 Jul 2007 12:14:32 +0000 Subject: [PATCH] simplify do_importsrcpkg() --- osc/commandline.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 2eda124f..09852e25 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1666,7 +1666,7 @@ class Osc(cmdln.Cmdln): help='set a title') @cmdln.option('-d', '--description', metavar='description', help='set the description of the package') - def do_importsrcpkg(self, subcmd, opts, *args): + def do_importsrcpkg(self, subcmd, opts, srpm): """${cmd_name}: import a new package from a src.rpm A new package dir will be created inside the project dir @@ -1677,20 +1677,12 @@ class Osc(cmdln.Cmdln): updated ( and <description />). The src.rpm will be extracted into the package dir. - usage: - osc importsrcpkg /path/to/src.rpm <options> + ${cmd_usage} ${cmd_option_list} """ import glob - if len(args) < 1: - print >>sys.stderr, 'too few arguments' - sys.exit(1) - elif len(args) > 1: - print >>sys.stderr, 'too many arguments' - sys.exit(1) - else: - srpm = os.path.abspath(args[0]) + srpm = os.path.abspath(srpm) if opts.project: project_dir = opts.project @@ -1741,6 +1733,7 @@ class Osc(cmdln.Cmdln): print 'Package \'%s\' imported successfully' % pac + @cmdln.option('-m', '--method', default='GET', metavar='HTTP_METHOD', help='specify HTTP method to use (GET|PUT|DELETE|POST)') @cmdln.option('-d', '--data', default=None, metavar='STRING',