Skip to content

Commit

Permalink
Merge branch 'fix_oscrqlist_issue_404' of https://github.com/lethliel…
Browse files Browse the repository at this point in the history
…/osc

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

Fixes: #404 (""osc rq list -P" doesn't really filter by project")
  • Loading branch information
marcus-h committed Apr 23, 2018
2 parents fba9af7 + eb2647f commit 22f0c21
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions osc/commandline.py
Original file line number Diff line number Diff line change
Expand Up @@ -2198,16 +2198,16 @@ def do_request(self, subcmd, opts, *args):
project = None
if len(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:
try:
project = store_read_project(os.curdir)
package = store_read_package(os.curdir)
except oscerr.NoWorkingCopy:
pass
elif opts.project:
project = opts.project
if opts.package:
package = opts.package

if len(args) > 1:
package = args[1]
Expand Down

0 comments on commit 22f0c21

Please sign in to comment.