=== modified file 'lib/canonical/archivepublisher/domination.py' --- lib/canonical/archivepublisher/domination.py 2007-10-20 12:45:07 +0000 +++ lib/canonical/archivepublisher/domination.py 2007-10-29 19:27:51 +0000 @@ -357,6 +357,7 @@ flush_database_updates() cur.execute("DROP TABLE PubDomHelper") + cur.close() dominate_status = [ PackagePublishingStatus.SUPERSEDED, PackagePublishingStatus.DELETED, === modified file 'lib/canonical/buildmaster/buildergroup.py' --- lib/canonical/buildmaster/buildergroup.py 2007-10-19 12:43:22 +0000 +++ lib/canonical/buildmaster/buildergroup.py 2007-10-29 19:33:05 +0000 @@ -380,6 +380,9 @@ os.mkdir(failed_dir) os.rename(upload_dir, os.path.join(failed_dir, upload_leaf)) + # XXX cprov 20071029: this check isn't relevant this days when + # the default isolation level is READ-COMMITED. Feel free to remove + # it. The tests will continue to pass. # The famous 'flush_updates + clear_cache' will make visible the # DB changes done in process-upload, considering that the # transaction was set with READ_COMMITED_ISOLATION isolation level. @@ -389,6 +392,7 @@ assert isolation_str == 'read committed', ( 'BuildMaster/BuilderGroup transaction isolation should be ' 'READ_COMMITTED_ISOLATION (not "%s")' % isolation_str) + cur.close() original_slave = queueItem.builder.slave === modified file 'scripts/ftpmaster-tools/initialise-from-parent.py' --- scripts/ftpmaster-tools/initialise-from-parent.py 2007-10-20 12:45:07 +0000 +++ scripts/ftpmaster-tools/initialise-from-parent.py 2007-10-29 19:28:28 +0000 @@ -157,6 +157,7 @@ FROM DistroArchRelease WHERE distrorelease = %s """ % sqlvalues(distroseries, distroseries.owner, distroseries.parentseries)) + cur.close() flush_database_caches() distroseries.nominatedarchindep = distroseries[ === modified file 'scripts/ftpmaster-tools/sync-source.py' --- scripts/ftpmaster-tools/sync-source.py 2007-10-21 20:44:47 +0000 +++ scripts/ftpmaster-tools/sync-source.py 2007-10-29 19:29:58 +0000 @@ -485,14 +485,17 @@ """ % sqlvalues( PackagePublishingStatus.PUBLISHED, archive_ids, das_ids) cur.execute(query) + binaries = cur.fetchall() + cur.close() print "Getting binaries for %s..." % (distro_series.name) - for (pkg, version, component) in cur.fetchall(): + for (pkg, version, component) in binaries: if not B.has_key(pkg): B[pkg] = [version, component] else: if apt_pkg.VersionCompare(B[pkg][0], version) < 0: B[pkg] = [version, component] + return B @@ -562,6 +565,8 @@ cur = cursor() cur.execute(query) results = cur.fetchall() + cur.close() + if results: if not filename.endswith("orig.tar.gz"): dak_utils.fubar(