mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 18:06:13 +01:00
Code

fix local package caching for snapcraft

Browse Source
This commit is contained in:
Adrian Schröter 2016-07-01 11:15:12 +02:00
parent b6f7d1be6c
commit f2faa82ac7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/build.py
View File

@ -128,8 +128,10 @@ class Buildinfo:
self.pacsuffix = 'arch'
if self.buildtype == 'livebuild':
self.pacsuffix = 'deb'
if self.buildtype == 'snapcaft':
self.pacsuffix = 'snap'
if self.buildtype == 'snapcraft':
# atm ubuntu is used as base, but we need to be more clever when
# snapcraft also supports rpm
self.pacsuffix = 'deb'
self.buildarch = root.find('arch').text
if root.find('hostarch') != None:
@ -500,7 +502,9 @@ def main(apiurl, opts, argv):
build_type = 'arch'
if os.path.basename(build_descr) == 'build.collax':
build_type = 'collax'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', 'yaml']:
if os.path.basename(build_descr) == 'snapcraft.yaml':
build_type = 'snapcraft'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', 'snapcraft']:
raise oscerr.WrongArgs(
'Unknown build type: \'%s\'. Build description should end in .spec, .dsc, .kiwi, .yaml or .livebuild.' \
% build_type)