mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-28 07:26:15 +01:00
Code

add support for snapcraft builds

Browse Source
This commit is contained in:
Adrian Schröter 2016-06-30 08:06:29 +02:00
parent 30213d0da4
commit d623cb8552
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/build.py
View File

@ -128,6 +128,8 @@ class Buildinfo:
self.pacsuffix = 'arch' self.pacsuffix = 'arch'
if self.buildtype == 'livebuild': if self.buildtype == 'livebuild':
self.pacsuffix = 'deb' self.pacsuffix = 'deb'
if self.buildtype == 'snapcaft':
self.pacsuffix = 'snap'
self.buildarch = root.find('arch').text self.buildarch = root.find('arch').text
if root.find('hostarch') != None: if root.find('hostarch') != None:
@ -354,6 +356,11 @@ def get_built_files(pacdir, buildtype):
'-name', '*.iso*'], '-name', '*.iso*'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = '' s_built = ''
elif buildtype == 'snapcraft':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'OTHER'),
'-name', '*.snap'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = ''
else: else:
print('WARNING: Unknown package type \'%s\'.' % buildtype, file=sys.stderr) print('WARNING: Unknown package type \'%s\'.' % buildtype, file=sys.stderr)
b_built = '' b_built = ''
@ -493,9 +500,9 @@ def main(apiurl, opts, argv):
build_type = 'arch' build_type = 'arch'
if os.path.basename(build_descr) == 'build.collax': if os.path.basename(build_descr) == 'build.collax':
build_type = 'collax' build_type = 'collax'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild']: if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', 'yaml']:
raise oscerr.WrongArgs( raise oscerr.WrongArgs(
'Unknown build type: \'%s\'. Build description should end in .spec, .dsc, .kiwi or .livebuild.' \ 'Unknown build type: \'%s\'. Build description should end in .spec, .dsc, .kiwi, .yaml or .livebuild.' \
% build_type) % build_type)
if not os.path.isfile(build_descr): if not os.path.isfile(build_descr):
raise oscerr.WrongArgs('Error: build description file named \'%s\' does not exist.' % build_descr) raise oscerr.WrongArgs('Error: build description file named \'%s\' does not exist.' % build_descr)