diff options
Diffstat (limited to 'cobbler')
-rw-r--r-- | cobbler/action_import.py | 2 | ||||
-rw-r--r-- | cobbler/webui/master.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 9bf18ba..660c154 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -353,7 +353,7 @@ class Importer: 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)) - if len(gloob1) >= 1 or len(gloob2) >= 1: + if len(gloob1) >= 1: if matches.has_key(dirname): print _("- looks like we've already scanned here: %s") % dirname continue diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 9dd79d5..e77f857 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1193780329.9635999 -__CHEETAH_genTimestamp__ = 'Tue Oct 30 17:38:49 2007' +__CHEETAH_genTime__ = 1194370912.779876 +__CHEETAH_genTimestamp__ = 'Tue Nov 6 12:41:52 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Mon Oct 29 16:39:12 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' |