From f50b237d12deb1ec4769856f59fc4b055862a41c Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 23 Apr 2012 02:09:01 -0500 Subject: [PATCH 1/2] Minor changes to Makefile for "make test" --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f09a9ba28..a850e98b2d 100644 --- a/Makefile +++ b/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 From be06b5fca1220271b53dfd3100cff9479e53969d Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 25 Apr 2012 12:35:20 -0500 Subject: [PATCH 2/2] BUGFIX - rename failed for distros that did not live under ks_mirror --- cobbler/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cobbler/utils.py b/cobbler/utils.py index 1de336de35..3fa997ede3 100644 --- a/cobbler/utils.py +++ b/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