mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

- a more generic version of ebd4b1d893 (the same logic applies to *.dsc, *.kiwi)

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-08 23:15:25 +02:00
parent 85d3391bd4
commit b213b9695b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osc/commandline.py
View File

@ -3920,8 +3920,7 @@ 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 :)
specs = glob.glob('*.spec')
descr = specs + glob.glob('*.dsc') + glob.glob('*.kiwi')
descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi')
# FIXME:
# * request repos from server and select by build type.
@ -3930,12 +3929,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
elif not arg_descr:
msg = None
if len(descr) > 1:
# 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:
# prefer build descr that match the directory name
# only if there are no other build descrs of different build types
for ext in ['.spec', '.dsc', '.kiwi']:
spec = os.path.basename(os.getcwd()) + ext
if spec in descr and not [i for i in descr if not i.endswith(ext)]:
arg_descr = spec
if not arg_descr:
msg = 'Multiple build description files found: %s' % ', '.join(descr)
else:
msg = 'Missing argument: build description (spec, dsc or kiwi file)'