Author: tille
Date: 2012-05-20 19:51:44 +0000 (Sun, 20 May 2012)
New Revision: 2341
Modified:
udd/udd/ftpnew_gatherer.py
Log:
Get component and section of binary packages properly
Modified: udd/udd/ftpnew_gatherer.py
===================================================================
--- udd/udd/ftpnew_gatherer.py 2012-05-20 03:00:37 UTC (rev 2340)
+++ udd/udd/ftpnew_gatherer.py 2012-05-20 19:51:44 UTC (rev 2341)
@@ -246,7 +246,6 @@
if has_warned_about_missing_section_key == 0:
has_warned_about_missing_section_key = 1
print >>stderr, "Warning: Because of a bug in DAK code the Section
field is currently missing."
-
# Check UDD for existing source packages of this name
query = "SELECT count(*) FROM sources WHERE source = '%s'" %
(srcpkg.s['Source'])
cur.execute(query)
@@ -414,8 +413,15 @@
print >>stderr, "This should not happen", srcpkg, field,
value
exit(-1)
else:
- binpkg.b[field] = value
- binpkg.b['Component'] = srcpkg.s['Component']
+ if value.startswith('non-free'):
+ binpkg.b['Component'] = 'non-free'
+ (dummy,binpkg.b[field]) = value.split('/')
+ elif value.startswith('contrib'):
+ binpkg.b['Component'] = 'contrib'
+ (dummy,binpkg.b[field]) = value.split('/')
+ else:
+ binpkg.b['Component'] = 'main'
+ binpkg.b[field] = value
elif field == 'Vcs-Browser':
srcpkg.s[field] = value
elif binpkg != None and field in dependencies_to_accept:
_______________________________________________
Collab-qa-commits mailing list
Collab-qa-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/collab-qa-commits
