Fix auto-repo attachment for RHEL5

2 files changed, 7 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 2f443bf..d476adf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ Cobbler CHANGELOG
 - fix typo down one error path in cobbler sync.
 - fix reposync handling when using rsync protocol and directory paths do not contain arch
 - allow basic usage of Cheetah variables in config files @@server@@, etc.
+- fix auto-repo attachment for distros with split trees (i.e. RHEL5)
 
 * Thu Aug 09 2007 - 0.6.0 
 - bugfix in error path in "cobbler check"
@@ -261,3 +262,4 @@ Cobbler CHANGELOG
 * Tue Jun 28 2006 - 0.1.0-1
 - rpm genesis
 
+
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 9531040..3703c13 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -311,14 +311,6 @@ class Importer:
        initrd = None
        kernel = None
        
-       # NOTE: can't make this optomization anymore since we may have to re-invoke
-       # walk for symlinks.
-       #
-       #
-       #if not self.is_relevant_dir(dirname):
-       #    print "DEBUG: %s is not relevant" % dirname
-       #    return
-
        for x in fnames:
 
            fullname = os.path.join(dirname,x)
@@ -355,9 +347,10 @@ class Importer:
 
    def repo_scanner(self,distro,dirname,fnames):
        
-       print "DEBUG: repo scanner for %s" % dirname
+       print "- processing: %s" % dirname
        for x in fnames:
-           if x == "base": # don't do "repodata"
+          if x == "base" or x == "repodata":
+               print "- need to process repo/comps: %s" % dirname
                self.process_comps_file(dirname, distro)
                continue
 
@@ -390,11 +383,13 @@ class Importer:
            # store the yum configs on the filesystem so we can use them later.
            # and configure them in the kickstart post, etc
 
+           print "- possible source repo match"
            counter = len(distro.source_repos)
 
            # find path segment for yum_url (changing filesystem path to http:// trailing fragment)
            seg = comps_path.rfind("ks_mirror")
            urlseg = comps_path[seg+10:]
+           print "- segment: %s" % urlseg
 
            # write a yum config file that shows how to use the repo.
            if counter == 0: