override

[dak.git] / dak / check_archive.py

diff --git a/dak/check_archive.py b/dak/check_archive.py
index bf10e6d4156e055beb032ced97c2bb9e9e446a7b..bed974de47293620d98d7964caed4757589dacbc 100755 (executable)
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -86,8 +86,8 @@ def process_dir (unused, dirname, filenames):
     @type dirname: string
     @param dirname: the directory to look at
 
-    @type filename: dict
-    @param filename: Known filenames to ignore
+    @type filenames: dict
+    @param filenames: Known filenames to ignore
     """
     global waste, db_files, excluded
 
@@ -151,8 +151,6 @@ def check_dscs():
     count = 0
     suite = 'unstable'
     for component in Cnf.SubTree("Component").List():
-        if component == "mixed":
-            continue
         component = component.lower()
         list_filename = '%s%s_%s_source.list' % (Cnf["Dir::Lists"], suite, component)
         list_file = utils.open_file(list_filename)
@@ -163,6 +161,9 @@ def check_dscs():
             except InvalidDscError, line:
                 utils.warn("syntax error in .dsc file '%s', line %s." % (f, line))
                 count += 1
+            except ChangesUnicodeError:
+                utils.warn("found invalid changes file, not properly utf-8 encoded")
+                count += 1
 
     if count:
         utils.warn("Found %s invalid .dsc files." % (count))
@@ -412,7 +413,7 @@ def check_indices_files_exist():
     """
     for suite in [ "stable", "testing", "unstable" ]:
         for component in Cnf.ValueList("Suite::%s::Components" % (suite)):
-            architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite))
+            architectures = database.get_suite_architectures(suite)
             for arch in [ i.lower() for i in architectures ]:
                 if arch == "source":
                     validate_sources(suite, component)