* buildd: Fixed strings.

* common.py: Revert find() addition - breaks sqlite cookie checker.
This commit is contained in:
Jonathan Patrick Davies 2008-09-09 11:58:27 +01:00
parent 788ebb89ff
commit c35c9c1246
3 changed files with 5 additions and 2 deletions

2
buildd
View File

@ -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+).*?<span>(\w+)</span>.*?</a>\s*([^\n]+)\n' % for m in re.finditer('"/ubuntu/\+source/%s/%s(/\+build/\d+)"[^\n]+\n\s*(\w+).*?<span>(\w+)</span>.*?</a>\s*([^\n]+)\n' %
(package.replace('+', '\+'), version.replace('+', '\+')), page, re.S): (package.replace('+', '\+'), version.replace('+', '\+')), page, re.S):
if m.group(2) == release: 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()] buildstats[url + m.group(1)] = [m.group(3).strip(), m.group(4).strip()]
# Operations. # Operations.

View File

@ -152,7 +152,7 @@ def prepareLaunchpadCookie():
def _check_for_launchpad_cookie(cookie_file): def _check_for_launchpad_cookie(cookie_file):
# Found SQLite file? Parse information from it. # Found SQLite file? Parse information from it.
if 'cookies.sqlite' in cookie_file.find(): if 'cookies.sqlite' in cookie_file:
import sqlite3 as sqlite import sqlite3 as sqlite
con = sqlite.connect(cookie_file) con = sqlite.connect(cookie_file)

3
debian/changelog vendored
View File

@ -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 - at the end, only modify those control files, so that the script doesn't
return 1 anymore when it was actually successful return 1 anymore when it was actually successful
[ Jonathan Patrick Davies ]
* buildd: Revert arch:status string format.
-- Adrien Cunin <adri2000@ubuntu.com> Sun, 07 Sep 2008 15:10:08 +0200 -- Adrien Cunin <adri2000@ubuntu.com> Sun, 07 Sep 2008 15:10:08 +0200
ubuntu-dev-tools (0.44ubuntu1) intrepid; urgency=low ubuntu-dev-tools (0.44ubuntu1) intrepid; urgency=low