X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=6e1f3893d66c5ad01ab93da39eda638be5f6e8cb;hb=1ccf225a945cbaefa60902a650a3156e5a4e8732;hp=f6bc3d4d104df702b8560d9bc2a19f4443074195;hpb=4e1aad646186f2df28c8dc8daeaabcdedbf161af;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index f6bc3d4d..6e1f3893 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -471,9 +471,6 @@ distribution."""
                 section = files[file]["section"]
                 override_section = files[file]["override section"]
                 if section.lower() != override_section.lower() and section != "-":
-                    # Ignore this; it's a common mistake and not worth whining about
-                    if section.lower() == "non-us/main" and override_section.lower() == "non-us":
-                        continue
                     summary += "%s: package says section is %s, override says %s.\n" % (file, section, override_section)
                 priority = files[file]["priority"]
                 override_priority = files[file]["override priority"]
@@ -673,10 +670,6 @@ distribution."""
         component_id = database.get_component_id(component)
         type_id = database.get_override_type_id(type)
 
-        # FIXME: nasty non-US speficic hack
-        if component.lower().startswith("non-us/"):
-            component = component[7:]
-
         q = self.projectB.query("SELECT s.section, p.priority FROM override o, section s, priority p WHERE package = '%s' AND suite = %s AND component = %s AND type = %s AND o.section = s.id AND o.priority = p.id"
                            % (package, suite_id, component_id, type_id))
         result = q.getresult()