* Merge from devel branch

debian/changelog

@@ -13,8 +13,13 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
 
   [ Michael Bienia ]
   * Drop python-launchpad-bugs from Depends.
+  * buildd: Add a --batch mode for batch retrying/rescoring of packages.
 
- -- Michael Bienia <geser@ubuntu.com>  Fri, 24 Jul 2009 09:19:45 +0200
+  [ Iain Lane ]
+  * requestsync: Guard some calls when -n is specified
+  * suspicious-source: Add *.hs *.el *.css to whitelist
+
+ -- Iain Lane <laney@ubuntu.com>  Sat, 08 Aug 2009 16:02:25 +0100
 
 ubuntu-dev-tools (0.75) karmic; urgency=low
 

requestsync

@@ -345,7 +345,11 @@ if __name__ == '__main__':
         sys.exit(1)
 
     # -s flag not specified - check if we do need sponsorship.
-    if not sponsorship: sponsorship = needSponsorship(srcpkg, component)
+    if (not newsource):
+		if (not sponsorship):
+			sponsorship = needsSponsorship(srcpkg, component)
+		else:
+			sponsorship = PersonTeam.getMe().isLpTeamMember('motu') # assume going to universe
 
     # Check for existing package reports.
     if not newsource and use_lp_bugs: checkExistingReports(srcpkg)
@@ -410,7 +414,7 @@ if __name__ == '__main__':
     if force_base_ver:
         base_ver = force_base_ver
 
-    report += 'Changelog since current %s version %s:\n\n' % (release, cur_ver)
+    if not newsource: report += 'Changelog since current %s version %s:\n\n' % (release, cur_ver)
     changelog = getDebianChangelog(debsrcpkg, Version(base_ver))
     if not changelog:
 	    sys.exit(1)

suspicious-source

@@ -26,9 +26,9 @@ FILES="*.h *.c *.cc *.cpp *.py *.sh *.txt *.text *.3 *.m4 *.xml *.html *.php \
        depcomp *.docbook  *.desktop *.menu AUTHORS INSTALL NEWS README TODO \
        COPYING LICENSE ChangeLog *.ui *.glade *.gladep *.po *.pot *.ts *.pro \
        *.svg *.png *.bmp *.gif *.xpm *.hh *.in *.cs *.1 *.2 *.3 *.4 *.5 *.6 \
-       *.7 *.8 *.9"
+       *.7 *.8 *.9 *.hs *.el *.css"
 
-IGNORE=".bzr CVS .svn debian"
+IGNORE=".bzr CVS .svn debian .git"
 
 
 COMMAND=(find ! \( )

ubuntutools/common.py

@@ -24,23 +24,11 @@
 #
 # ##################################################################
 
-import cookielib
-import glob
-import os.path
-import re
-import subprocess
+import os
 import sys
-import urllib2
-import urlparse
-import urllib
 
 # Clear https_proxy env var as it's not supported in urllib/urllib2; see
 # LP #122551
 if os.environ.has_key('https_proxy'):
     print >> sys.stderr, "Ignoring https_proxy (no support in urllib/urllib2; see LP #122551)"
     del os.environ['https_proxy']
-
-
-
-
-