Fix a number of syntax errors. Also do not remove elements from a dict where we itera...

diff --git a/dak/check_transitions.py b/dak/check_transitions.py
index 089c60efa0c3c658020780619313677650f45de9..39f24b4d6552b0fdf62d878f41419925080b1ba6 100755 (executable)
--- a/dak/check_transitions.py
+++ b/dak/check_transitions.py
@@ -23,7 +23,7 @@
 
 ################################################################################
 
-import os, sys
+import os, pg, sys
 import apt_pkg
 import daklib.database
 import daklib.utils
@@ -70,6 +70,9 @@ def usage (exit_code=0):
 
 def main():
     global Cnf
+
+    init()
+    
     # Only check if there is a file defined (and existant) with checks. It's a little bit
     # specific to Debian, not much use for others, so return early there.
     if not Cnf.has_key("Dinstall::Reject::ReleaseTransitions") or not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])):
@@ -79,8 +82,9 @@ def main():
     
     # Parse the yaml file
     sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r')
+    sourcecontent = sourcefile.read()
     try:
-        transitions = load(sourcefile)
+        transitions = load(sourcecontent)
     except error, msg:
         # This shouldn't happen, the release team has a wrapper to check the file, but better
         # safe then sorry
@@ -88,9 +92,9 @@ def main():
         sys.exit(2)
 
     to_dump = 0
-
+    to_remove = []
     # Now look through all defined transitions
-    for trans in transition:
+    for trans in transitions:
         t = transition[trans]
         source = t["source"]
         new_vers = t["new"]
@@ -99,15 +103,13 @@ def main():
         curvers = daklib.database.get_testing_version(source)
 
         print """
-        Looking at transition: %s
-         Source:      %s
-         New Version: %s
-         Responsible: %s
-         Reason:      %s
-         Blocked Packages (total: %d):
-        """ % (trans, source, new_vers, t["rm"], t["reason"])
-        for i in t["packages"]:
-            print " %s" % (i)
+Looking at transition: %s
+ Source:      %s
+ New Version: %s
+ Responsible: %s
+ Reason:      %s
+ Blocked Packages (total: %d): %s
+""" % (trans, source, new_vers, t["rm"], t["reason"], len(t["packages"]), ", ".join(t["packages"]))
 
         if curvers and apt_pkg.VersionCompare(new_vers, curvers) == 1:
             # This is still valid, the current version in database is older than
@@ -116,13 +118,15 @@ def main():
         else:
             print "This transition is over, the target package reached testing, removing"
             print "%s wanted version: %s, has %s" % (source, new_vers, curvers)
-            del transition[trans]
+            to_remove.append(trans)
             to_dump = 1
         print "-------------------------------------------------------------------------"
 
     if to_dump:
+        for remove in to_remove:
+            del transitions[remove]
         destfile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'w')
-        dump(transition, destfile)
+        dump(transitions, destfile)
 
 ################################################################################
 

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index a958d23eb98bca3a92ba92e76fd3ca46e509ab59..dc92f74fc5a2065d4d7259b788002f8966c16860 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1013,8 +1013,9 @@ def check_transition(sourcepkg):
     
     # Parse the yaml file
     sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r')
+    sourcecontent = sourcefile.read()
     try:
-        transitions = load(sourcefile)
+        transitions = load(sourcecontent)
     except error, msg:
         # This shouldn't happen, the release team has a wrapper to check the file, but better
         # safe then sorry
@@ -1022,8 +1023,8 @@ def check_transition(sourcepkg):
         return
 
     # Now look through all defined transitions
-    for trans in transition:
-        t = transition[trans]
+    for trans in transitions:
+        t = transitions[trans]
         source = t["source"]
         new_vers = t["new"]
 

diff --git a/daklib/database.py b/daklib/database.py
index 3a6c9aec341c8c991f0f9ec7f50bc67c77b9ec00..d9fdc850c745ac234004fc94c6b643e3cbddc661 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -41,6 +41,7 @@ maintainer_cache = {}
 fingerprint_id_cache = {}
 queue_id_cache = {}
 uid_id_cache = {}
+testing_version_cache = {}
 
 ################################################################################
 
@@ -229,7 +230,7 @@ def get_testing_version(source):
     if testing_version_cache.has_key(source):
         return testing_version_cache[source]
 
-    q = Upload.projectB.query("""
+    q = projectB.query("""
     SELECT s.version FROM source s, suite su, src_associations sa
     WHERE sa.source=s.id
       AND sa.suite=su.id