Merge pull request #1452 from adrianschroeter/productcompose

productcompose: Support building with updateinfo.xml data

osc/build.py

@@ -275,7 +275,9 @@ class Pac:
         else:
             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'
         elif pacsuffix == 'deb':
             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
             sffn = i.fullfilename
             filename = sffn.split("/")[-1]
+            if i.name == 'updateinfo.xml':
+                adir = 'updateinfo'
+                filename = i.package + ':' + i.repoarch + ':updateinfo.xml'
             # project/repo
             if i.name.startswith("container:"):
                 prdir = "containers/" + pdir + "/" + rdir

osc/commandline.py

@@ -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') + \
             glob.glob('PKGBUILD') + glob.glob('build.collax') + glob.glob('Dockerfile') + \
             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:
         # * request repos from server and select by build type.

osc/util/packagequery.py

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