X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=ed4f6b1ace28e3dcb255cbfe9a48d3c17b1409f7;hb=7db74628f24f99562e82bbc3876ef4a33466db5c;hp=fa20100b40a69167f173dd8657c954dd40d84240;hpb=beea055f0a4d3514346c552da194e79d3640ed85;p=dak.git

diff --git a/dak/control_suite.py b/dak/control_suite.py
index fa20100b..ed4f6b1a 100755
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -179,14 +179,14 @@ def version_checks(package, architecture, target_suite, new_version, session, fo
     for suite, version in suite_version_list:
         cmp = apt_pkg.VersionCompare(new_version, version)
         if suite in must_be_newer_than and cmp < 1:
-            utils.warn("%s (%s): version check violated: %s in %s is *not* newer than %s targeted at %s" % (package, architecture, version, suite, new_version, target_suite))
+            utils.warn("%s (%s): version check violated: %s targeted at %s is *not* newer than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
             violations = True
         if suite in must_be_older_than and cmp > 1:
-            utils.warn("%s (%s): version check violated: %s in %s is *not* older than %s targeted at %s" % (package, architecture, version, suite, new_version, target_suite))
+            utils.warn("%s (%s): version check violated: %s targeted at %s is *not* older than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
             violations = True
 
     if violations:
-        if forced:
+        if force:
             utils.warn("Continuing anyway (forced)...")
         else:
             utils.fubar("Aborting. Version checks violated and not forced.")
@@ -424,7 +424,7 @@ def main ():
     if action == "list":
         get_list(suite, session)
     else:
-        Logger = daklog.Logger(cnf.Cnf, "control-suite")
+        Logger = daklog.Logger("control-suite")
         if file_list:
             for f in file_list:
                 process_file(utils.open_file(f), suite, action, session, britney, force)