From 97bed31aa1d6269ece3ec7cd59c6e26e21b65a18 Mon Sep 17 00:00:00 2001 From: Michael Bienia Date: Wed, 29 Jul 2009 23:16:13 +0200 Subject: [PATCH 1/4] Add an entry to debian/changelog. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8ebdeb0..2967cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ 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 Fri, 24 Jul 2009 09:19:45 +0200 + -- Michael Bienia Wed, 29 Jul 2009 23:14:22 +0200 ubuntu-dev-tools (0.75) karmic; urgency=low From 3e71ff7ab7732c028a0a583ba60ef560ef3ca642 Mon Sep 17 00:00:00 2001 From: Michael Bienia Date: Fri, 7 Aug 2009 13:10:22 +0200 Subject: [PATCH 2/4] ubuntutools/common.py: remove unneeded imports --- ubuntutools/common.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/ubuntutools/common.py b/ubuntutools/common.py index 3d1f242..7fb41be 100644 --- a/ubuntutools/common.py +++ b/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'] - - - - - From 39594f64e0912918c31c1db6b7e48b61015a0a90 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sat, 8 Aug 2009 16:03:28 +0100 Subject: [PATCH 3/4] * requestsync: Guard some calls when -n is specified * suspicious-source: Add *.hs *.el *.css to whitelist --- debian/changelog | 6 +++++- requestsync | 8 ++++++-- suspicious-source | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2967cca..2e32db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,11 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low * Drop python-launchpad-bugs from Depends. * buildd: Add a --batch mode for batch retrying/rescoring of packages. - -- Michael Bienia Wed, 29 Jul 2009 23:14:22 +0200 + [ Iain Lane ] + * requestsync: Guard some calls when -n is specified + * suspicious-source: Add *.hs *.el *.css to whitelist + + -- Iain Lane Sat, 08 Aug 2009 16:02:25 +0100 ubuntu-dev-tools (0.75) karmic; urgency=low diff --git a/requestsync b/requestsync index 5065b58..a1e21b9 100755 --- a/requestsync +++ b/requestsync @@ -501,7 +501,11 @@ if __name__ == '__main__': sys.exit(1) # -s flag not specified - check if we do need sponsorship. - if not sponsorship: sponsorship = checkNeedsSponsorship(srcpkg) + if (not newsource): + if (not sponsorship): + sponsorship = checkNeedsSponsorship(srcpkg) + else: + sponsorship = LpApiWrapper.isLpTeamMember('motu') # assume going to universe # Check for existing package reports. if not newsource and use_lp_bugs: checkExistingReports(srcpkg) @@ -566,7 +570,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) report += debian_changelog(srcpkg, debiancomponent, base_ver) + '\n' if need_interaction: diff --git a/suspicious-source b/suspicious-source index e4d81f9..3eb835a 100755 --- a/suspicious-source +++ b/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 ! \( ) From 17c36f9107d8e6d31670b27ef62c15292b95f0a7 Mon Sep 17 00:00:00 2001 From: Michael Bienia Date: Sun, 9 Aug 2009 13:20:13 +0200 Subject: [PATCH 4/4] requestsync: Call isLpTeamMember() from the correct object --- requestsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requestsync b/requestsync index 3168d15..20186cc 100755 --- a/requestsync +++ b/requestsync @@ -505,7 +505,7 @@ if __name__ == '__main__': if (not sponsorship): sponsorship = checkNeedsSponsorship(srcpkg) else: - sponsorship = LpApiWrapper.isLpTeamMember('motu') # assume going to universe + sponsorship = PersonTeam.getMe().isLpTeamMember('motu') # assume going to universe # Check for existing package reports. if not newsource and use_lp_bugs: checkExistingReports(srcpkg)