mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-28 09:00:46 +02:00
Code Activity

Merge branch 'support_appimage_yml' of https://github.com/adrianschroeter/osc

Browse Source 
Support "appimage.yml" in parse_repoarchdescr.
This commit is contained in:
Marcus Huewe
2019-10-21 16:06:29 +02:00
parent 598ad1034d e43d0641c6
commit 3025dbf954
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osc/commandline.py
View File

@@ -6059,7 +6059,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for subarch in osc.build.can_also_build.get(mainarch): for subarch in osc.build.can_also_build.get(mainarch):
all_archs.append(subarch) all_archs.append(subarch)
for arg in args: for arg in args:
if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg.endswith('.livebuild') or arg == 'PKGBUILD' or arg == 'build.collax' or arg == 'Dockerfile' or arg == 'fissile.yml': if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg.endswith('.livebuild') or arg == 'PKGBUILD' or arg == 'build.collax' or arg == 'Dockerfile' or arg == 'fissile.yml' or arg == 'appimage.yml':
arg_descr = arg arg_descr = arg
else: else:
if (arg == osc.build.hostarch or arg in all_archs) and arg_arch is None: if (arg == osc.build.hostarch or arg in all_archs) and arg_arch is None:
@@ -6121,7 +6121,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# reduce(lambda x, y: x + y, (glob.glob(x) for x in ('*.spec', '*.dsc', '*.kiwi'))) # reduce(lambda x, y: x + y, (glob.glob(x) for x in ('*.spec', '*.dsc', '*.kiwi')))
# but be a bit more readable :) # but be a bit more readable :)
descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi') + glob.glob('*.livebuild') \ descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi') + glob.glob('*.livebuild') \
+ glob.glob('PKGBUILD') + glob.glob('build.collax') + glob.glob('Dockerfile') + glob.glob('fissile.yml') + glob.glob('PKGBUILD') + glob.glob('build.collax') + glob.glob('Dockerfile') + glob.glob('fissile.yml') \
+ glob.glob('appimage.yml')
# FIXME: # FIXME:
# * request repos from server and select by build type. # * request repos from server and select by build type.
@@ -6180,7 +6181,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if not arg_descr: if not arg_descr:
msg = 'Multiple build description files found: %s' % ', '.join(cands) msg = 'Multiple build description files found: %s' % ', '.join(cands)
elif not ignore_descr: elif not ignore_descr:
msg = 'Missing argument: build description (spec, dsc, kiwi or livebuild file)' msg = 'Missing argument: build description (for example a spec, dsc or kiwi file)'
try: try:
p = Package('.') p = Package('.')
if p.islink() and not p.isexpanded(): if p.islink() and not p.isexpanded():