Merge with upstream

diff --git a/ChangeLog b/ChangeLog
index cfbeffb73860ef0bd97334451263c125fec66e7e..8b132e72ced87f40b23e1cd44fecbfe98f26010d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,11 @@
        changes[architecture] has source included.
        (check_transition): Now call the database.get_testing_version
 
+2008-02-09  Christoph Berg <myon@debian.org>
+
+       * daklib/queue.py (get_type): fubar does not exist in global
+       namespace.
+
 2008-02-06  Joerg Jaspert  <joerg@debian.org>
 
        * daklib/utils.py (check_signature): Make variable key available,

diff --git a/daklib/queue.py b/daklib/queue.py
index 05cd0be0a2d142f4c74d7552512e21defdcb6a6d..9fac0cc00b2053e3deb63b7778adff9da48242b3 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -106,12 +106,12 @@ def get_type(f):
     elif f["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2", "dsc" ]:
         type = "dsc"
     else:
-        fubar("invalid type (%s) for new.  Dazed, confused and sure as heck not continuing." % (type))
+        utils.fubar("invalid type (%s) for new.  Dazed, confused and sure as heck not continuing." % (type))
 
     # Validate the override type
     type_id = database.get_override_type_id(type)
     if type_id == -1:
-        fubar("invalid type (%s) for new.  Say wha?" % (type))
+        utils.fubar("invalid type (%s) for new.  Say wha?" % (type))
 
     return type