Apply Matt Hyclak's comps.xml patch to trunk, so that if we want to release trunk for bugfixes sometime, we can, and don't have to wait on 0.7.X

1 files changed, 3 insertions, 3 deletions

diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 660c154..1eb341a 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -352,7 +352,7 @@ class Importer:
        for x in fnames:
           if x == "base" or x == "repodata":
                # only run the repo scanner on directories that contain a comps.xml
-               gloob1 = glob.glob("%s/%s/comps*.xml" % (dirname,x))
+               gloob1 = glob.glob("%s/%s/*comps*.xml" % (dirname,x))
                if len(gloob1) >= 1:
                    if matches.has_key(dirname):
                        print _("- looks like we've already scanned here: %s") % dirname
@@ -379,8 +379,8 @@ class Importer:
        print _("- scanning: %(path)s (distro: %(name)s)") % { "path" : comps_path, "name" : distro.name }
 
        # figure out what our comps file is ...
-       print _("- looking for %(p1)s/%(p2)s/comps*.xml") % { "p1" : comps_path, "p2" : masterdir }
-       files = glob.glob("%s/%s/comps*.xml" % (comps_path, masterdir))
+       print _("- looking for %(p1)s/%(p2)s/*comps*.xml") % { "p1" : comps_path, "p2" : masterdir }
+       files = glob.glob("%s/%s/*comps*.xml" % (comps_path, masterdir))
        if len(files) == 0:
            print _("- no comps found here: %s") % os.path.join(comps_path, masterdir)
            return # no comps xml file found