Remove use of Component in dak.conf, use db instead

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index f42092735e0495796075233446328d694e715c8f..a9f4886c9627275b4844bbb76ceb16d5ebd5d415 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -293,28 +293,6 @@ Archive
   };
 };
 
-Component
-{
-  main
-  {
-       Description "Main";
-       MeetsDFSG "true";
-  };
-
-  contrib
-  {
-       Description "Contrib";
-       MeetsDFSG "true";
-  };
-
-  non-free
-  {
-     Description "Software that fails to meet the DFSG";
-     MeetsDFSG "false";
-  };
-
-};
-
 Section
 {
   admin;

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index a5f7473d01ede79a8703fd374a09ef108e461f69..fb23848eed79e396c039234f06554070a12ae081 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -304,29 +304,6 @@ Archive
 
 };
 
-Component
-{
-
-  updates/main
-  {
-       Description "Main (updates)";
-       MeetsDFSG "true";
-  };
-
-  updates/contrib
-  {
-       Description "Contrib (updates)";
-       MeetsDFSG "true";
-  };
-
-  updates/non-free
-  {
-       Description "Software that fails to meet the DFSG";
-       MeetsDFSG "false";
-  };
-
-};
-
 ComponentMappings
 {
  "main updates/main";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index bdbdf2c08f1472fe4acddad4de422519febea8c0..293df65dc1eaac04fbde44f2196e2fc78742527a 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -383,27 +383,6 @@ Archive
   };
 };
 
-Component
-{
-  main
-  {
-       Description "Main";
-       MeetsDFSG "true";
-  };
-
-  contrib
-  {
-       Description "Contrib";
-       MeetsDFSG "true";
-  };
-
-  non-free
-  {
-       Description "Software that fails to meet the DFSG";
-       MeetsDFSG "false";
-  };
-};
-
 Urgency
 {
   Default "low";

diff --git a/daklib/utils.py b/daklib/utils.py
index fd4d7bbf8ed2fa6478836c229d8f138b874ec6f7..413bcb6dcc79b51f245ee87a151216953c28713b 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -143,10 +143,11 @@ def extract_component_from_section(section):
 
     # Expand default component
     if component == "":
-        if Cnf.has_key("Component::%s" % section):
-            component = section
-        else:
+        comp = get_component(section)
+        if comp is None:
             component = "main"
+        else:
+            component = comp.componant_name
 
     return (section, component)