Suppress warnings in the most suitable files.

[dak.git] / daklib / binary.py

diff --git a/daklib/binary.py b/daklib/binary.py
index a70aadb943fb2e713a5771f113782384e612d251..d1f78f3ae0cd4b908fb389b2e2683d0dc4c0625b 100644 (file)
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -47,7 +47,12 @@ import commands
 import traceback
 import atexit
 
-from debian_bundle import deb822
+try:
+    # starting with squeeze
+    from debian import deb822
+except:
+    # up to lenny
+    from debian_bundle import deb822
 
 from dbconn import *
 from config import Config
@@ -324,13 +329,13 @@ def copy_temporary_contents(binary, bin_association, reject, session=None):
         table = "deb_contents"
     else:
         return False
-    
+
 
     if component.name == "main":
         component_str = ""
     else:
         component_str = component.name + "/"
-        
+
     vals = { 'package':binary.package,
              'version':binary.version,
              'arch':binary.architecture,