Merge pull request #151 from jimi1283/master

BUGFIX - rename failed for distros that did not live under ks_mirror and Makefile for testing

Makefile

@@ -28,9 +28,10 @@ test:
 	/sbin/service cobblerd restart
 	-(make nosetests)
 	make restorestate prefix=test
+	/sbin/service cobblerd restart
 
 nosetests:
-	nosetests cobbler/*.py -v | tee test.log
+	nosetests cobbler/*.py -v 2>&1 | tee test.log
 
 build:
 	python setup.py build -f

cobbler/utils.py

@@ -2129,7 +2129,9 @@ def find_distro_path(settings, distro):
     for dir in possible_dirs:
         if os.path.dirname(distro.kernel).find(dir) != -1:
             return os.path.join(settings.webdir, "ks_mirror", dir)
-    return None
+    # non-standard directory, assume it's the same as the
+    # directory in which the given distro's kernel is
+    return os.path.dirname(distro.kernel)
 
 if __name__ == "__main__":
     print os_release() # returns 2, not 3