handle non-US non-main properly

diff --git a/test/004/test.py b/test/004/test.py
index e0a02d6031f45eb8a95a2287b7501a765e5131ba..86aad8a697f8c5ffdcd6adcef82df79af7e1f1d0 100755 (executable)
--- a/test/004/test.py
+++ b/test/004/test.py
@@ -2,7 +2,7 @@
 
 # Check utils.extract_component_from_section()
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: test.py,v 1.1 2001-06-10 16:35:04 troup Exp $
+# $Id: test.py,v 1.2 2002-01-19 18:58:07 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,6 +107,16 @@ def main ():
     input = "utIls"; output = ("utIls", "main");
     test (input, output);
 
+    # Others..
+    input = "non-US/libs"; output = ("non-US/libs", "non-US/main");
+    test (input, output);
+    input = "non-US/main/libs"; output = ("non-US/main/libs", "non-US/main");
+    test (input, output);
+    input = "non-US/contrib/libs"; output = ("non-US/contrib/libs", "non-US/contrib");
+    test (input, output);
+    input = "non-US/non-free/libs"; output = ("non-US/non-free/libs", "non-US/non-free");
+    test (input, output);
+
 ################################################################################
 
 if __name__ == '__main__':

diff --git a/utils.py b/utils.py
index 938134e8fc11764f327f5b3aec2d195881ce5580..ebe3f9653c55544ffd4da24b840af25b76dfcbfe 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.36 2001-11-18 19:57:58 rmurray Exp $
+# $Id: utils.py,v 1.37 2002-01-19 18:58:07 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import commands, os, pwd, re, socket, shutil, stat, string, sys, tempfile
+import commands, os, pwd, re, socket, shutil, stat, string, sys, tempfile, traceback
 import apt_pkg
 
 re_comments = re.compile(r"\#.*")
@@ -89,9 +89,9 @@ def extract_component_from_section(section):
     if string.find(section, '/') != -1:
         component = string.split(section, '/')[0];
     if string.lower(component) == "non-us" and string.count(section, '/') > 0:
-        s = string.split(section, '/')[1];
+        s = component + '/' + string.split(section, '/')[1];
         if Cnf.has_key("Component::%s" % s): # Avoid e.g. non-US/libs
-            component = string.split(section, '/')[0]+ '/' + string.split(section, '/')[1];
+            component = s;
 
     if string.lower(section) == "non-us":
         component = "non-US/main";