From 1fa547d0596a2636c7212e7ef7184a8c4a4f0ec7 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 11 Jan 2009 17:23:03 +0000 Subject: [PATCH 1/4] pbuilder-dist: Remove extra ". --- pbuilder-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pbuilder-dist b/pbuilder-dist index 6556feb..50730e4 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -216,7 +216,7 @@ class pbuilder_dist: components = 'main restricted' if self.extra_components: components += ' universe multiverse' - arguments.append('--components %s"' % components) + arguments.append('--components %s' % components) if self.build_architecture != self.system_architecture: arguments.append('--debootstrapopts --arch') From 304cd20e8e11e5c3bacd3b71f00b165650df4cdc Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sun, 25 Jan 2009 00:15:06 +0000 Subject: [PATCH 2/4] requestsync: Only attempt to change bug importance if in ubuntu-dev, as it will fail otherwise. --- debian/changelog | 7 ++++++- requestsync | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 697b312..03cc432 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ ubuntu-dev-tools (0.60) UNRELEASED; urgency=low + [ Jonathan Davies ] * ubuntutools/common.py: Now split into multiple files depending on function. * Adjusted imports on all files as necessary for the change above. - -- Jonathan Davies Mon, 19 Jan 2009 18:00:15 +0000 + [ Iain Lane ] + * requestsync: Only attempt to change bug importance if in ubuntu-dev, as it + will fail otherwise. + + -- Iain Lane Sun, 25 Jan 2009 00:14:23 +0000 ubuntu-dev-tools (0.59) jaunty; urgency=low diff --git a/requestsync b/requestsync index 572f43f..ea8eeae 100755 --- a/requestsync +++ b/requestsync @@ -389,7 +389,9 @@ def post_bug(source_package, subscribe, status, bugtitle, bugtext): #newly created bugreports have one task task = bug.bug_tasks[0] - task.transitionToImportance(importance='Wishlist') + # Only members of ubuntu-bugs can set importance + if lp_functions.isLPTeamMember('ubuntu-bugs'): + task.transitionToImportance(importance='Wishlist') task.transitionToStatus(status=status) subscribe_url = "%s~%s" %(launchpad._root_uri, subscribe) From 354a42b6697216b196815958f10066d6f9e4b0b9 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sun, 25 Jan 2009 01:05:02 +0000 Subject: [PATCH 3/4] ubuntutools/lp/functions.py: Rename urlopener import as it conflicts with a variable, causing an error. --- debian/changelog | 4 +++- ubuntutools/lp/functions.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03cc432..b47086e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ ubuntu-dev-tools (0.60) UNRELEASED; urgency=low [ Iain Lane ] * requestsync: Only attempt to change bug importance if in ubuntu-dev, as it will fail otherwise. + * ubuntutools/lp/functions.py: Rename urlopener import as it conflicts with + a variable, causing an error. - -- Iain Lane Sun, 25 Jan 2009 00:14:23 +0000 + -- Iain Lane Sun, 25 Jan 2009 01:04:40 +0000 ubuntu-dev-tools (0.59) jaunty; urgency=low diff --git a/ubuntutools/lp/functions.py b/ubuntutools/lp/functions.py index dbe1d89..9261e73 100644 --- a/ubuntutools/lp/functions.py +++ b/ubuntutools/lp/functions.py @@ -1,5 +1,5 @@ import cookie -import urlopener +import urlopener as lp_urlopener def isLPTeamMember(team): """ Checks if the user is a member of a certain team on Launchpad. @@ -17,7 +17,7 @@ def isLPTeamMember(team): # Prepare cookie. cookieFile = cookie.prepareLaunchpadCookie() # Prepare URL opener. - urlopener = urlopener.setupLaunchpadUrlOpener(cookieFile) + urlopener = lp_urlopener.setupLaunchpadUrlOpener(cookieFile) # Try to open the Launchpad team page: try: From afd4082d6f2dfbfdf344d73989409b5642ea5a82 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sun, 25 Jan 2009 01:07:51 +0000 Subject: [PATCH 4/4] will fail otherwise (LP: #320984). --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b47086e..f0cdd4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,11 +7,11 @@ ubuntu-dev-tools (0.60) UNRELEASED; urgency=low [ Iain Lane ] * requestsync: Only attempt to change bug importance if in ubuntu-dev, as it - will fail otherwise. + will fail otherwise (LP: #320984). * ubuntutools/lp/functions.py: Rename urlopener import as it conflicts with a variable, causing an error. - -- Iain Lane Sun, 25 Jan 2009 01:04:40 +0000 + -- Iain Lane Sun, 25 Jan 2009 01:07:28 +0000 ubuntu-dev-tools (0.59) jaunty; urgency=low