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

- remove redundant checks etc.

Browse Source
This commit is contained in:
Marcus Huewe 2010-02-09 00:08:21 +01:00
parent 8b53dbbffd
commit 4c3df68afd
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osc/commandline.py
View File

@ -1261,7 +1261,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
apiurl = conf.config['apiurl'] apiurl = conf.config['apiurl']
package = None package = None
if not args or len(args) == 0: if len(args) == 0:
p = findpacs(os.curdir)[0] p = findpacs(os.curdir)[0]
project = p.prjname project = p.prjname
package = p.name package = p.name
@ -1553,7 +1553,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
maintained_attribute = conf.config['maintained_attribute'] maintained_attribute = conf.config['maintained_attribute']
maintained_update_project_attribute = conf.config['maintained_update_project_attribute'] maintained_update_project_attribute = conf.config['maintained_update_project_attribute']
if not (len(args) >= 1 and len(args) <= 2): if not len(args) or len(args) > 2:
raise oscerr.WrongArgs('Wrong number of arguments.') raise oscerr.WrongArgs('Wrong number of arguments.')
if len(args) >= 1: if len(args) >= 1:
package = args[0] package = args[0]
@ -1750,7 +1750,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
""" """
args = parseargs(args) args = parseargs(args)
if opts.specfile and (len(args) == 1): if opts.specfile and len(args) == 1:
specfile = opts.specfile specfile = opts.specfile
else: else:
specfile = None specfile = None
@ -2406,7 +2406,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args.sort() args.sort()
pacs = findpacs(args) pacs = findpacs(args)
if opts.revision and ( len(args) == 1): if opts.revision and len(args) == 1:
rev, dummy = parseRevisionOption(opts.revision) rev, dummy = parseRevisionOption(opts.revision)
if not checkRevision(pacs[0].prjname, pacs[0].name, rev, pacs[0].apiurl): if not checkRevision(pacs[0].prjname, pacs[0].name, rev, pacs[0].apiurl):
print >>sys.stderr, 'Revision \'%s\' does not exist' % rev print >>sys.stderr, 'Revision \'%s\' does not exist' % rev
@ -2766,7 +2766,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if opts.start: if opts.start:
offset = int(opts.start) offset = int(opts.start)
if args is None or len(args) < 2: if len(args) < 2:
self.print_repos() self.print_repos()
repository = args[0] repository = args[0]
@ -2851,7 +2851,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
project = package = repository = arch = None project = package = repository = arch = None
if ( args is None or len(args) < 2): if len(args) < 2:
self.print_repos() self.print_repos()
if len(args) == 2: # 2 if len(args) == 2: # 2
@ -2916,7 +2916,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
project = packages = repository = arch = reverse = None project = packages = repository = arch = reverse = None
if ( args is None or len(args) < 2) and (is_package_dir('.') or is_project_dir('.')): if len(args) < 2 and (is_package_dir('.') or is_project_dir('.')):
self.print_repos() self.print_repos()
if len(args) > 5: if len(args) > 5:
@ -2987,7 +2987,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
wd = os.curdir wd = os.curdir
args = slash_split(args) args = slash_split(args)
if ( args is None or len(args) < 2) and is_package_dir('.'): if len(args) < 2 and is_package_dir('.'):
self.print_repos() self.print_repos()
if len(args) > 5: if len(args) > 5:
@ -3048,7 +3048,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
wd = os.curdir wd = os.curdir
args = slash_split(args) args = slash_split(args)
if ( args is None or len(args) < 2) and is_package_dir('.'): if len(args) < 2 and is_package_dir('.'):
self.print_repos() self.print_repos()
if len(args) > 4: if len(args) > 4:
@ -3356,7 +3356,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
${cmd_option_list} ${cmd_option_list}
""" """
if ( args is None or len(args) < 2) and is_package_dir('.'): if len(args) < 2 and is_package_dir('.'):
self.print_repos() self.print_repos()
if len(args) == 4: if len(args) == 4:
@ -3400,8 +3400,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
wd = os.curdir wd = os.curdir
args = slash_split(args) args = slash_split(args)
if (args is None or len(args) < 2) \ if len(args) < 2) and (is_project_dir('.') or is_package_dir('.')):
and (is_project_dir('.') or is_package_dir('.')):
self.print_repos() self.print_repos()
if len(args) == 4: if len(args) == 4:
@ -3652,7 +3651,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
apiurl = conf.config['apiurl'] apiurl = conf.config['apiurl']
if ( args is None or len(args) < 2) and is_package_dir('.'): if len(args) < 2 and is_package_dir('.'):
self.print_repos() self.print_repos()
if len(args) == 4: if len(args) == 4: