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

Merge pull request #626 from lethliel/fix_623_wrong_repo_list

Browse Source 
Add project parameter to print_repos
This commit is contained in:
Marco Strigl 2019-08-30 10:35:47 +02:00 committed by GitHub
commit 4f73767edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osc/commandline.py
View File

@ -5465,23 +5465,29 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print_buildlog(apiurl, project, package, repository, arch, offset, strip_time, opts.last) print_buildlog(apiurl, project, package, repository, arch, offset, strip_time, opts.last)
def print_repos(self, repos_only=False, exc_class=oscerr.WrongArgs, exc_msg='Missing arguments'): def print_repos(self, repos_only=False, exc_class=oscerr.WrongArgs, exc_msg='Missing arguments', project=None):
wd = os.curdir wd = os.curdir
doprint = False doprint = False
if is_package_dir(wd): if is_package_dir(wd):
msg = "package" msg = 'Valid arguments for this package are:'
doprint = True doprint = True
elif is_project_dir(wd): elif is_project_dir(wd):
msg = "project" msg = 'Valid arguments for this project are:'
doprint = True
args = []
if project is not None:
args.append(project)
msg = 'Valid arguments are:'
doprint=True doprint=True
if doprint: if doprint:
print('Valid arguments for this %s are:' % msg) print(msg)
print() print()
if repos_only: if repos_only:
self.do_repositories("repos_only", None) self.do_repositories("repos_only", None, *args)
else: else:
self.do_repositories(None, None) self.do_repositories(None, None, *args)
raise exc_class(exc_msg) raise exc_class(exc_msg)
@cmdln.alias('rbl') @cmdln.alias('rbl')
@ -7280,7 +7286,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
repos = list(get_repos_of_project(apiurl, project)) repos = list(get_repos_of_project(apiurl, project))
if not [i for i in repos if repository == i.name]: if not [i for i in repos if repository == i.name]:
self.print_repos(exc_msg='Invalid repository \'%s\'' % repository) self.print_repos(exc_msg='Invalid repository \'%s\'' % repository, project=project)
arches = [architecture] arches = [architecture]
if architecture is None: if architecture is None: