[Collab-qa-commits] r1918 - udd/udd

[Andreas Tille]

Author: tille
Date: 2011-03-11 07:33:49 +0000 (Fri, 11 Mar 2011)
New Revision: 1918

Modified:
   udd/udd/ftpnew_gatherer.py
Log:
Avoid some useless warnings


Modified: udd/udd/ftpnew_gatherer.py
===================================================================
--- udd/udd/ftpnew_gatherer.py	2011-03-09 21:42:20 UTC (rev 1917)
+++ udd/udd/ftpnew_gatherer.py	2011-03-11 07:33:49 UTC (rev 1918)
@@ -6,7 +6,10 @@
     http://ftp-master.debian.org/new.html
 """
 
-from debian_bundle import deb822
+try:
+    from debian import deb822
+except:
+    from debian_bundle import deb822
 from os import access, mkdir, unlink, W_OK
 from sys import stderr
 import aux
@@ -343,7 +346,8 @@
                     else:
                       print >>stderr, "Bug #%i of package %s and source %s is not against pseudopackage 'wnpp' and hast title '%s'" % bug_info
                 if not ftpnew_gatherer.closes_is_itp_re.match(wnpp_title):
-                  print >>stderr, "Bug %i closed by source package %s seems to be not ITPed" % (ival, srcpkg.s['Source'])
+                  # print >>stderr, "Bug %i closed by source package %s seems to be not ITPed" % (ival, srcpkg.s['Source'])
+                  pass # avoid useless warnings
                 else:
                   if found_itp:
                     if DEBUG != 0:
@@ -362,7 +366,7 @@
               print >>srco, "%s: %s\n" % (field, value)
             elif field == 'Distribution':
               if in_source:
-                if srcpkg.has_several_versions == 0 and value != srcpkg.s['Distribution']:
+                if srcpkg.has_several_versions == 0 and value.strip() != srcpkg.s['Distribution']:
                   print >>stderr, "Incompatible distributions between new.822(%s) and %s.html (%s)" % \
                       (srcpkg.s['Distribution'], src_info_base, value)
                 srcpkg.s[field] = value