particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into mead

Browse source
This commit is contained in:
Mike McLean 2008-11-14 17:09:15 -05:00
commit e5f3574fa5
1 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

63
koji/__init__.py
View file

@ -990,10 +990,11 @@ def generate_comps(groups, expand_groups=False):
if pkg['requires']:
opts += ' requires="%s"' % pkg['requires']
return "<packagereq %(opts)s>%(name)s</packagereq>" % locals()
if g['packagelist']:
data.append(
data.append(
""" <packagelist>
""")
if g['packagelist']:
packagelist = list(g['packagelist'])
packagelist.sort(lambda a,b:cmp(a['package'],b['package']))
for p in packagelist:
@ -1001,41 +1002,41 @@ def generate_comps(groups, expand_groups=False):
""" %s
""" % package_entry(p))
# also include expanded list, if needed
if expand_groups and g['grouplist']:
#add a requires entry for all packages in groups required by buildgroup
need = [req['name'] for req in g['grouplist']]
seen_grp = { g['name'] : 1}
seen_pkg = {}
for p in g['packagelist']:
seen_pkg[p['package']] = 1
for group_name in need:
if seen_grp.has_key(group_name):
continue
seen_grp[group_name] = 1
group = group_idx.get(group_name)
if group is None:
data.append(
if expand_groups and g['grouplist']:
#add a requires entry for all packages in groups required by buildgroup
need = [req['name'] for req in g['grouplist']]
seen_grp = { g['name'] : 1}
seen_pkg = {}
for p in g['packagelist']:
seen_pkg[p['package']] = 1
for group_name in need:
if seen_grp.has_key(group_name):
continue
seen_grp[group_name] = 1
group = group_idx.get(group_name)
if group is None:
data.append(
""" <!-- MISSING GROUP: %s -->
""" % group_name)
continue
data.append(
continue
data.append(
""" <!-- Expanding Group: %s -->
""" % group_name)
pkglist = list(group['packagelist'])
pkglist.sort(lambda a,b: cmp(a['package'], b['package']))
for pkg in pkglist:
pkg_name = pkg['package']
if seen_pkg.has_key(pkg_name):
continue
data.append(
pkglist = list(group['packagelist'])
pkglist.sort(lambda a,b: cmp(a['package'], b['package']))
for pkg in pkglist:
pkg_name = pkg['package']
if seen_pkg.has_key(pkg_name):
continue
data.append(
""" %s
""" % package_entry(pkg))
for req in group['grouplist']:
req_name = req['name']
if seen_grp.has_key(req_name):
continue
need.append(req_name)
data.append(
for req in group['grouplist']:
req_name = req['name']
if seen_grp.has_key(req_name):
continue
need.append(req_name)
data.append(
""" </packagelist>
""")
data.append(