From 728bb807d5c727d41621b6e77ae0c85d21f88fbc Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Wed, 13 Aug 2008 10:56:53 +0100
Subject: [PATCH] Better handle errors when going to LP

---
 debian/changelog |  5 ++-
 pull-lp-source   | 83 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e233d0..67f4635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,10 @@ ubuntu-dev-tools (0.39ubuntu1) intrepid; urgency=low
   * common.py:
      - Add functions mkdir and readlist.
 
- -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Tue, 12 Aug 2008 20:09:42 +0200
+  [ Iain Lane ]
+  * pull-lp-source: Better handle errors when going to LP 
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Wed, 13 Aug 2008 10:56:12 +0100
 
 ubuntu-dev-tools (0.38ubuntu1) intrepid; urgency=low
 
diff --git a/pull-lp-source b/pull-lp-source
index f666743..abf338c 100755
--- a/pull-lp-source
+++ b/pull-lp-source
@@ -34,26 +34,26 @@ from optparse import OptionParser
 
 class BackportFromLP:
 
-	def __getitem__(self, name):
-		return getattr(self, name)
-	
-	def __init__(self, package, target_release):
-		self.package = package
-		self.target_release = target_release
-		self.__prepare_sources()
-	
-	def __prepare_sources(self):
-		# Scrape the source package from Launchpad :)
-		contents = urllib2.urlopen('https://launchpad.net/ubuntu/%(target_release)s/+source/%(package)s' % self).read()
-		links = re.findall('a href=\"(.*\.dsc)\"', contents)
-		
-		if len(links) == 1 and \
-	    subprocess.call(['dget', '-x', 'http://launchpad.net%s' % links[0]]) == 0:
-			print '\nSuccess!'
-		else:
-			raise ValueError, '\nFailed to fetch and extract the source. ' +\
-				'Ensure that the package specified is a valid source ' +\
-				'package name and that Launchpad is not down.'
+    def __getitem__(self, name):
+        return getattr(self, name)
+    
+    def __init__(self, package, target_release):
+        self.package = package
+        self.target_release = target_release
+        self.__prepare_sources()
+    
+    def __prepare_sources(self):
+        # Scrape the source package from Launchpad :)
+        contents = urllib2.urlopen('https://launchpad.net/ubuntu/%(target_release)s/+source/%(package)s' % self).read()
+        links = re.findall('a href=\"(.*\.dsc)\"', contents)
+        
+        if len(links) == 1 and \
+        subprocess.call(['dget', '-xu', 'http://launchpad.net%s' % links[0]]) == 0:
+            print '\nSuccess!'
+        else:
+            raise ValueError, '\nFailed to fetch and extract the source. ' +\
+                'Ensure that the package specified is a valid source ' +\
+                'package name and that Launchpad is not down.'
 
 default_release = 'intrepid'
 
@@ -74,7 +74,7 @@ if __name__ == '__main__':
     else:
         release = os.getenv('DIST') or default_release
 
-	# Correct-ish args, can proceed.
+    # Correct-ish args, can proceed.
     # Check release by checking if Launchpad page exists
     try:
         urllib2.urlopen("https://launchpad.net/ubuntu/%s" % release)
@@ -84,20 +84,43 @@ if __name__ == '__main__':
         sys.exit(1)
 
     # Check package exists.
-    sourcePage = urllib2.urlopen("https://launchpad.net/ubuntu/%s/+source/%s" % \
-        (release, package)).read()
-    m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release, \
-        package.replace('+', '\+')), sourcePage)
-    if not m:
-        print >> sys.stderr, "The '%s' package does not appear to exist in " \
-            "the '%s' release." % (package, release)
+    try:
+
+        sourcePage = urllib2.urlopen("https://launchpad.net/ubuntu/%s/+source/%s" % \
+            (release, package)).read()
+        m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release, \
+            package.replace('+', '\+')), sourcePage)
+    
+        if not m:
+            print >> sys.stderr, "The '%s' package does not appear to exist in " \
+                "the '%s' release." % (package, release)
+            sys.exit(1)
+
+    except urllib2.HTTPError, e: # Raised on 404
+           
+        if e.code == 404:
+
+            print >> sys.stderr, "The '%s' package does not appear to exist in " \
+                "the '%s' release." % (package, release)
+
+        else: # Other code, probably LP malfunction
+            
+            print >> sys.stderr, "Error when checking Launchpad for package: %s " % e
+
         sys.exit(1)
 
+    except urllib2.URLError, e: # Other error (NXDOMAIN, ...)
+
+            (_, reason) = e.reason
+
+            print >> sys.stderr, "Error when checking Launchpad for package: %s " % reason
+            sys.exit(1)
+
     # All good - start downloading...
     try:
         print 'Attempting to get %s from release %s...' % \
-		    (package, release.capitalize())
+            (package, release.capitalize())
         BackportFromLP(package, release)
     except ValueError, e:
         print 'Error when downloading package %s from release %s: %s.' % \
-		    (package, release, e)
+            (package, release, e)