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

prefer spec files that match the directory name only if there are no debian or kiwi files

Browse Source 
partially reverts commit 1b6fbd7d05.
This commit is contained in:
Ludwig Nussel 2010-08-04 17:17:28 +02:00
parent e3828801db
commit ebd4b1d893
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osc/commandline.py
View File

@ -3888,7 +3888,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# can be implemented using
# reduce(lambda x, y: x + y, (glob.glob(x) for x in ('*.spec', '*.dsc', '*.kiwi')))
# but be a bit more readable :)
descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi')
specs = glob.glob('*.spec')
descr = specs + glob.glob('*.dsc') + glob.glob('*.kiwi')
# FIXME:
# * request repos from server and select by build type.
@ -3897,7 +3898,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
elif not arg_descr:
msg = None
if len(descr) > 1:
msg = 'Multiple build description files found: %s' % ', '.join(descr)
# prefer spec files that match the directory name
# only if there are no debian or kiwi files
spec = os.path.basename(os.getcwd())+'.spec'
if spec in specs and len(specs) == len(descr):
arg_descr = spec
else:
msg = 'Multiple build description files found: %s' % ', '.join(descr)
else:
msg = 'Missing argument: build description (spec, dsc or kiwi file)'
try: