Merged branch from Joe Bernard, fixes LP: #436006.

This commit is contained in:
Jonathan Davies 2009-09-24 17:36:31 +01:00
commit d093c7b35c
2 changed files with 5 additions and 1 deletions

4
debian/changelog vendored
View File

@ -17,6 +17,10 @@ ubuntu-dev-tools (0.80) UNRELEASED; urgency=low
[ Nathan Handler ] [ Nathan Handler ]
* debian/control: Mention pull-revu-source in description * debian/control: Mention pull-revu-source in description
[ Joe Bernard ]
* Launchpad API changed causing pull-lp-source to fail to parse the .dsc
file from the URL contents (LP: #436006).
-- Iain Lane <laney@ubuntu.com> Thu, 24 Sep 2009 12:38:52 +0100 -- Iain Lane <laney@ubuntu.com> Thu, 24 Sep 2009 12:38:52 +0100
ubuntu-dev-tools (0.79) karmic; urgency=low ubuntu-dev-tools (0.79) karmic; urgency=low

View File

@ -54,7 +54,7 @@ class BackportFromLP:
def __prepare_sources(self): def __prepare_sources(self):
# Scrape the source package from Launchpad :) # Scrape the source package from Launchpad :)
contents = urllib2.urlopen('https://launchpad.net/ubuntu/%(target_release)s/+source/%(package)s' % self).read() contents = urllib2.urlopen('https://launchpad.net/ubuntu/%(target_release)s/+source/%(package)s' % self).read()
links = re.findall('a href=\"(.*\.dsc)\"', contents) links = re.findall('href=\"(.*\.dsc)\"', contents)
if len(links) == 1 and \ if len(links) == 1 and \
subprocess.call(['dget', '-xu', 'https://launchpad.net%s' % links[0]]) == 0: subprocess.call(['dget', '-xu', 'https://launchpad.net%s' % links[0]]) == 0: