From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 23 Apr 2008 18:44:09 +0000 (+0200)
Subject: Merge with upstream
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=330833cdf958e43962e208f8021e0e44f1fc100c;hp=881bcc7216f229b7a6ff00a3885d71292621850b;p=dak.git

Merge with upstream
---

diff --git a/ChangeLog b/ChangeLog
index cfbeffb7..8b132e72 100644
--- 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 05cd0be0..9fac0cc0 100755
--- 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