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

[Andreas Tille]

Author: tille
Date: 2009-08-14 12:59:36 +0000 (Fri, 14 Aug 2009)
New Revision: 1557

Modified:
   udd/udd/ftpnew_gatherer.py
Log:
Make ftpnew gatherer even less verbose


Modified: udd/udd/ftpnew_gatherer.py
===================================================================
--- udd/udd/ftpnew_gatherer.py	2009-08-14 12:31:28 UTC (rev 1556)
+++ udd/udd/ftpnew_gatherer.py	2009-08-14 12:59:36 UTC (rev 1557)
@@ -225,7 +225,7 @@
       if in_udd:
         if DEBUG != 0:
           print >>stderr, "%s is %i times in UDD - no interest in just known sources (queue = %s)" \
-    	                  % (srcpkg.s['Source'], int(in_udd), srcpkg.s['Source'])
+    	                  % (srcpkg.s['Source'], int(in_udd), srcpkg.s['Queue'])
         continue
 
       src_info_base = srcpkg.s['Source'] + '_' + srcpkg.s['Version']
@@ -326,13 +326,13 @@
                 print >>stderr, "Closed bug %i seems to be not ITPed (queue = %s; title = %s)" % (ival, srcpkg.s['Queue'], wnpp_title)
               else:
                 if found_itp:
-                  print >>stderr, "Warning: Package %s seems to have more than one ITP bugs (%i, %i). Only %i is stored in UDD" % \
-                      (srcpkg.s['Source'], srcpkg.s['Closes'], ival, srcpkg.s['Closes'])
+                  print >>stderr, "Warning: Package %s seems to have more than one ITP bugs (%i, %i). Only %i is stored in UDD (queue = %s)" % \
+                      (srcpkg.s['Source'], srcpkg.s['Closes'], ival, srcpkg.s['Closes'], srcpkg.s['Queue'])
                   query = "SELECT count(*) FROM bugs_merged_with WHERE id = %i OR id = %i" % (srcpkg.s['Closes'], ival)
                   cur.execute(query)
                   is_merged = cur.fetchone()[0]
-                  if is_merged != 2:
-                    print >>stderr, "  --> Bugs should be merged in BTS!"
+                  if is_merged != 2 and DEBUG != 0:
+                    print >>stderr, "  --> Please verify whether bugs should could be merged in BTS!"
                 else: # stay with the ITP found first 
                   srcpkg.s['Closes'] = int(ival)
                 found_itp = 1