Merge remote branch 'ftpmaster/master'

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 11823b8e83ed595f7a886758e384e598eeeff74f..96fb97f9fa7632bd4a5a54759ee806994544de7b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -51,14 +51,6 @@ Queue-Report
   };
 };
 
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 721950b9fa765c930fe54c53647b8eecae78621c..24f662e113b25b818ccda92016acd193fe42fdee 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -95,19 +95,6 @@ Rm
    Bcc "removed-packages@qa.debian.org";
 };
 
-Import-Archive
-{
-  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
-};
-
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";

diff --git a/daklib/utils.py b/daklib/utils.py
index 133500c66fc90883a6be95c6b535fbb6302fee78..8bc1b2c7c2c4db01405b6d375e8e30d2fb8981ad 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -138,7 +138,7 @@ def our_raw_input(prompt=""):
 
 ################################################################################
 
-def extract_component_from_section(section):
+def extract_component_from_section(section, session=None):
     component = ""
 
     if section.find('/') != -1:
@@ -146,11 +146,11 @@ def extract_component_from_section(section):
 
     # Expand default component
     if component == "":
-        comp = get_component(section)
+        comp = get_component(section, session)
         if comp is None:
             component = "main"
         else:
-            component = comp.componant_name
+            component = comp.component_name
 
     return (section, component)
 

diff --git a/tests/dbtest_extract_component_from_section.py b/tests/dbtest_extract_component_from_section.py
index e21c378e40a5c9a717b41b6949ed278adc6185d8..b389ad1b4d8f45679fa7eac61fb7b68781ea1697 100755 (executable)
--- a/tests/dbtest_extract_component_from_section.py
+++ b/tests/dbtest_extract_component_from_section.py
@@ -22,8 +22,9 @@ class ExtractComponentTestCase(DBDakTestCase):
     """
 
     def assertExtract(self, input, output):
+        self.setup_components()
         self.assertEqual(
-            extract_component_from_section(input)[1],
+            extract_component_from_section(input, self.session)[1],
             output,
         )