diff --git a/debian/changelog b/debian/changelog index 697b312..f0cdd4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ 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 (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:07:28 +0000 ubuntu-dev-tools (0.59) jaunty; urgency=low diff --git a/pbuilder-dist b/pbuilder-dist index 81bb933..aed0cd3 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -216,6 +216,7 @@ class pbuilder_dist: components = 'main restricted' if self.extra_components: components += ' universe multiverse' + arguments.append('--components "%s"' % components) if self.build_architecture != self.system_architecture: 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) diff --git a/ubuntutools/lp/functions.py b/ubuntutools/lp/functions.py index 883c423..bd44509 100644 --- a/ubuntutools/lp/functions.py +++ b/ubuntutools/lp/functions.py @@ -19,7 +19,7 @@ # 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. @@ -37,7 +37,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: