From c35c9c1246c6b876297d0b0030501680e89fe5c7 Mon Sep 17 00:00:00 2001 From: Jonathan Patrick Davies Date: Tue, 9 Sep 2008 11:58:27 +0100 Subject: [PATCH] * buildd: Fixed strings. * common.py: Revert find() addition - breaks sqlite cookie checker. --- buildd | 2 +- common.py | 2 +- debian/changelog | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildd b/buildd index 49cbdc7..ea779ed 100755 --- a/buildd +++ b/buildd @@ -109,7 +109,7 @@ print "Current build status for this package is as follows:" for m in re.finditer('"/ubuntu/\+source/%s/%s(/\+build/\d+)"[^\n]+\n\s*(\w+).*?(\w+).*?\s*([^\n]+)\n' % (package.replace('+', '\+'), version.replace('+', '\+')), page, re.S): if m.group(2) == release: - print '%s\t: %s.' % (m.group(3), m.group(4)) + print '%s: %s.' % (m.group(3), m.group(4)) buildstats[url + m.group(1)] = [m.group(3).strip(), m.group(4).strip()] # Operations. diff --git a/common.py b/common.py index 032db37..5f3bca7 100644 --- a/common.py +++ b/common.py @@ -152,7 +152,7 @@ def prepareLaunchpadCookie(): def _check_for_launchpad_cookie(cookie_file): # Found SQLite file? Parse information from it. - if 'cookies.sqlite' in cookie_file.find(): + if 'cookies.sqlite' in cookie_file: import sqlite3 as sqlite con = sqlite.connect(cookie_file) diff --git a/debian/changelog b/debian/changelog index e226355..388aace 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ ubuntu-dev-tools (0.45ubuntu1) intrepid; urgency=low - at the end, only modify those control files, so that the script doesn't return 1 anymore when it was actually successful + [ Jonathan Patrick Davies ] + * buildd: Revert arch:status string format. + -- Adrien Cunin Sun, 07 Sep 2008 15:10:08 +0200 ubuntu-dev-tools (0.44ubuntu1) intrepid; urgency=low