update postinst-setup

[bin.git] / buildd.py

diff --git a/buildd.py b/buildd.py
index 9fec2a67b24c3d47d646a2b6421b77b2280b08cc..598d8d13c20a19ffcf9a408723e72218ff9d7462 100755 (executable)
--- a/buildd.py
+++ b/buildd.py
@@ -30,10 +30,15 @@ urlopener = urllib2.build_opener()
 urlopener.add_handler(urllib2.HTTPCookieProcessor(cj))
 
 # find out the version in given release
-page = urlopener.open('https://launchpad.net/ubuntu/+source/' + package).read()
-m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release, package), page)
+try:
+       page = urlopener.open('https://launchpad.net/ubuntu/+source/' + package).read()
+except urllib2.HTTPError:
+    print >> sys.stderr, 'This source does not appear to exist in Ubuntu'
+    sys.exit(1)
+
+m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release, package.replace('+', '\+')), page)
 if not m:
-    print >> sys.stderr, 'Cannot find this package'
+    print >> sys.stderr, 'Cannot find this source package in this release'
     sys.exit(1)
 version = m.group(1)
 print 'Source version:', version
@@ -44,7 +49,7 @@ page = urlopener.open('https://launchpad.net/ubuntu/+source/%s/%s' % (package, v
 url = page.geturl()
 page = page.read()
 for m in re.finditer('"/ubuntu/\+source/%s/%s(/\+build/\d+)"[^\n]+\n\s*(\w+).*?<span>(\w+)</span>.*?</a>\s*([^\n]+)\n' %
-    (package, version.replace('+', '\+')), page, re.S):
+    (package.replace('+', '\+'), version.replace('+', '\+')), page, re.S):
     if m.group(2) == release:
         print '%s: %s' % (m.group(3), m.group(4))
         buildstats[url + m.group(1)] = [m.group(3).strip(), m.group(4).strip()]
@@ -60,7 +65,7 @@ for build, (arch, status) in buildstats.iteritems():
             urlopener.open(build+'/+rescore', urlencode(
                 {'SCORE': '5000', 'RESCORE': '1'}))
     elif op == 'retry':
-        if status in ('Failed to build', 'Chroot problem'):
+        if status in ('Failed to build', 'Chroot problem', 'Failed to upload'):
             print 'retrying', build, '(%s)' % arch
             urlopener.open(build+'/+retry', urlencode(
                 {'RETRY': '1'}))