1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-21 09:46:19 +02:00

Merge branch 'fix_oscrqlist_issue_404' of https://github.com/lethliel/osc

Consider "--project ..." and "--package ..." options when running
"osc rq list/approvenew".

Fixes: #404 (""osc rq list -P" doesn't really filter by project")
This commit is contained in:
Marcus Huewe 2018-04-23 22:32:50 +02:00
commit 22f0c21b57

View File

@ -2198,16 +2198,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
project = None project = None
if len(args) > 0: if len(args) > 0:
project = args[0] project = args[0]
elif opts.project:
project = opts.project
if opts.package:
package = opts.package
elif not opts.mine and not opts.user and not opts.group: elif not opts.mine and not opts.user and not opts.group:
try: try:
project = store_read_project(os.curdir) project = store_read_project(os.curdir)
package = store_read_package(os.curdir) package = store_read_package(os.curdir)
except oscerr.NoWorkingCopy: except oscerr.NoWorkingCopy:
pass pass
elif opts.project:
project = opts.project
if opts.package:
package = opts.package
if len(args) > 1: if len(args) > 1:
package = args[1] package = args[1]