support buildinfos with binary present - and don't die with XML

Author: coolo

osc/build.py

@@ -164,7 +164,7 @@ class Pac:
     def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs = []):
 
         self.mp = {}
-        for i in ['name', 'package',
+        for i in ['binary', 'package',
                   'version', 'release',
                   'project', 'repository',
                   'preinstall', 'vminstall', 'noinstall', 'runscripts',
@@ -176,6 +176,7 @@ def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs = []):
         self.mp['pacsuffix']  = pacsuffix
 
         self.mp['arch'] = node.get('arch') or self.mp['buildarch']
+        self.mp['name'] = node.get('name') or self.mp['binary']
 
         # this is not the ideal place to check if the package is a localdep or not
         localdep = self.mp['name'] in localpkgs and not self.mp['noinstall']
@@ -205,7 +206,8 @@ def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs = []):
         if self.mp['repopackage'] == '_repository':
             self.mp['repofilename'] = self.mp['name']
         else:
-            self.mp['repofilename'] = self.mp['filename']
+            # OBS 2.3 puts binary into product bdeps (noinstall ones)
+            self.mp['repofilename'] = self.mp['binary'] or self.mp['filename']
 
         # make the content of the dictionary accessible as class attributes
         self.__dict__.update(self.mp)

osc/fetch.py

@@ -165,7 +165,14 @@ def fetch(self, pac, prefix=''):
     def move_package(self, tmpfile, destdir, pac_obj = None):
         import shutil
         pkgq = packagequery.PackageQuery.query(tmpfile, extra_rpmtags=(1044, 1051, 1052))
-        canonname = pkgq.canonname()
+        if pkgq:
+          canonname = pkgq.canonname()
+        else:
+          if pac_obj is None:
+            print >>sys.stderr, 'Unsupported file type: ', tmpfile
+            sys.exit(1)
+          canonname = pac_obj.binary
+
         fullfilename = os.path.join(destdir, canonname)
         if pac_obj is not None:
             pac_obj.filename = canonname

osc/util/packagequery.py

@@ -98,8 +98,11 @@ def query(filename, all_tags = False, extra_rpmtags = (), extra_debtags = ()):
             import debquery
             pkgquery = debquery.DebQuery(f)
             extra_tags = extra_debtags
+        elif magic[:5] == '<?xml':
+	    f.close()
+	    return None
         else:
-            raise PackageError('unsupported package type. magic: \'%s\' (%s)' % (magic, filename))
+            raise PackageError(filename, 'unsupported package type. magic: \'%s\'' % magic)
         pkgquery.read(all_tags, *extra_tags)
         f.close()
         return pkgquery