Merge branch 'merge'

* merge:
  new arch specific contents files; get override type id from database instead of hardcoded
  make p-u use the new utils.temp_dirname() method
  don't import tempfile in contents.py
  move mkdtmp to utils.temp_directory
  Revert "Revert "Merge commit 'stew/content_generation' into merge""
  fixing Binary.reject.  adding better logging when we get an error in contents insertion
  back to ./ for tarballs
  get contents branch working with etch era pacakges

diff --git a/dak/bts_categorize.py b/dak/bts_categorize.py
index 1e0349d0d0ebb67ed9381a9abf9fe856033e05cc..663690a1973d9e767c71147bba66dd9c44e50a1b 100755 (executable)
--- a/dak/bts_categorize.py
+++ b/dak/bts_categorize.py
@@ -128,7 +128,7 @@ class BugClassifier(object):
 
             return controls
         except:
-            log.error("couldn't retreive bugs from soap interface: %s" % sys.exc_info()[0])
+            log.error("couldn't retrieve bugs from soap interface: %s" % sys.exc_info()[0])
             return None
 
 def send_email(commands, simulate=False):