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

Merge pull request #1452 from adrianschroeter/productcompose

Browse Source 
productcompose: Support building with updateinfo.xml data
This commit is contained in:
Daniel Mach
2024-01-02 08:05:25 +01:00
committed by GitHub
parent 29e7deee62 7434a31a89
commit 31059f0f92
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osc/build.py
View File

@@ -275,7 +275,9 @@ class Pac:
else: else:
release = self.mp['release'].encode() release = self.mp['release'].encode()
if self.mp['name'].startswith('container:'): if self.mp['binary'] == 'updateinfo.xml':
canonname = 'updateinfo.xml'
elif self.mp['name'].startswith('container:'):
canonname = self.mp['name'] + '.tar.xz' canonname = self.mp['name'] + '.tar.xz'
elif pacsuffix == 'deb': elif pacsuffix == 'deb':
canonname = debquery.DebQuery.filename(self.mp['name'].encode(), epoch, self.mp['version'].encode(), release, self.mp['arch'].encode()) canonname = debquery.DebQuery.filename(self.mp['name'].encode(), epoch, self.mp['version'].encode(), release, self.mp['arch'].encode())
@@ -1251,6 +1253,9 @@ def main(apiurl, store, opts, argv):
# source fullfilename # source fullfilename
sffn = i.fullfilename sffn = i.fullfilename
filename = sffn.split("/")[-1] filename = sffn.split("/")[-1]
if i.name == 'updateinfo.xml':
adir = 'updateinfo'
filename = i.package + ':' + i.repoarch + ':updateinfo.xml'
# project/repo # project/repo
if i.name.startswith("container:"): if i.name.startswith("container:"):
prdir = "containers/" + pdir + "/" + rdir prdir = "containers/" + pdir + "/" + rdir

3
osc/commandline.py
View File

@@ -6972,7 +6972,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
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('PKGBUILD') + glob.glob('build.collax') + glob.glob('Dockerfile') + \
glob.glob('fissile.yml') + glob.glob('appimage.yml') + glob.glob('Chart.yaml') + \ glob.glob('fissile.yml') + glob.glob('appimage.yml') + glob.glob('Chart.yaml') + \
glob.glob('*flatpak.yaml') + glob.glob('*flatpak.yml') + glob.glob('*flatpak.json') glob.glob('*flatpak.yaml') + glob.glob('*flatpak.yml') + glob.glob('*flatpak.json') + \
glob.glob('*.productcompose')
# FIXME: # FIXME:
# * request repos from server and select by build type. # * request repos from server and select by build type.

3
osc/util/packagequery.py
View File

@@ -74,6 +74,9 @@ class PackageQuery:
from . import debquery from . import debquery
pkgquery = debquery.DebQuery(f) pkgquery = debquery.DebQuery(f)
extra_tags = extra_debtags extra_tags = extra_debtags
elif magic == b'<update':
f.close()
return None
elif magic[:5] == b'<?xml': elif magic[:5] == b'<?xml':
f.close() f.close()
return None return None