From 34d31a60a7db0024d3194adf0004ff916de34b0a Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Wed, 27 Jul 2011 11:04:58 +0100 Subject: [PATCH] Remove use of Component in dak.conf, use db instead Signed-off-by: Mark Hymers --- config/backports/dak.conf | 22 ---------------------- config/debian-security/dak.conf | 23 ----------------------- config/debian/dak.conf | 21 --------------------- daklib/utils.py | 7 ++++--- 4 files changed, 4 insertions(+), 69 deletions(-) diff --git a/config/backports/dak.conf b/config/backports/dak.conf index f4209273..a9f4886c 100644 --- 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 a5f7473d..fb23848e 100644 --- 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 bdbdf2c0..293df65d 100644 --- 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 fd4d7bbf..413bcb6d 100755 --- 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) -- 2.39.5