debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Conflicts where not handled by gencontrol.py, added. 

svn path=/dists/trunk/linux-2.6/; revision=4782
This commit is contained in:
Sven Luther 2005-11-10 08:35:02 +00:00
parent 8234b900d3
commit 0f1c3d0f0a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/bin/gencontrol.py vendored
View File

@ -162,7 +162,7 @@ def process_description(e, in_e, vars):
def process_package(in_entry, vars):
e = entry()
for i in in_entry.iterkeys():
if i in (('Depends', 'Provides', 'Suggests', 'Recommends')):
if i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
process_depends(i, e, in_entry, vars)
elif i == 'Description':
process_description(e, in_entry, vars)
@ -183,7 +183,7 @@ def process_real_image(in_entry, vars):
if vars.has_key('desc'):
in_entry['Description'] += "\n.\n" + vars['desc']
entry = process_package(in_entry, vars)
for i in (('Depends', 'Provides', 'Suggests', 'Recommends')):
for i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
value = []
tmp = entry.get(i, None)
if tmp:
@ -206,6 +206,10 @@ def process_real_image(in_entry, vars):
t = vars.get('recommends', None)
if t is not None:
value.append(t)
elif i == 'Conflicts':
t = vars.get('conflicts', None)
if t is not None:
value.append(t)
entry[i] = ', '.join(value)
return entry