diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 15:59:43 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 15:59:43 -0400 |
| commit | 88d3a806dc30736dc6b4d755da79d658807e6c9e (patch) | |
| tree | 078a7993b7d763b57394b8bfda7ed267f12dffeb | |
| parent | 1e7b1b8ba5a982ca801a4d8246934a2315dd5931 (diff) | |
| download | cobbler-88d3a806dc30736dc6b4d755da79d658807e6c9e.tar.gz cobbler-88d3a806dc30736dc6b4d755da79d658807e6c9e.tar.xz cobbler-88d3a806dc30736dc6b4d755da79d658807e6c9e.zip | |
yum reposync should pull all kernels, not just i386 kernels, when doing reposync
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | cobbler/action_reposync.py | 6 | ||||
| -rw-r--r-- | cobbler/module_loader.py | 5 |
3 files changed, 10 insertions, 2 deletions
@@ -6,6 +6,7 @@ Cobbler CHANGELOG - remove rhpl reference - scrub references to manage_*_mode and rewrite the restart-services trigger - add new settings to control whether the restart-trigger restarts things +- yum reposync should also pull i686 kernels, not just i386 - Mon Jun 09 2008 - 1.0.2 - Fix mkdir invocation diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index 57c2d08b..9168f129 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -128,10 +128,14 @@ class RepoSync: if not has_rpm_list and repo.mirror_locally: # if we have not requested only certain RPMs, use reposync cmd = "/usr/bin/reposync --config=%s --repoid=%s --download_path=%s" % (temp_file, repo.name, store_path) + if repo.arch != "": if repo.arch == "x86": repo.arch = "i386" # FIX potential arch errors - cmd = "%s -a %s" % (cmd, repo.arch) + # counter-intuitive, but we want the newish kernels too + cmd = "%s -a i686" % (cmd, repo.arch) + else: + cmd = "%s -a %s" % (cmd, repo.arch) print _("- %s") % cmd cmds.append(cmd) diff --git a/cobbler/module_loader.py b/cobbler/module_loader.py index d584ce3f..12d14d3d 100644 --- a/cobbler/module_loader.py +++ b/cobbler/module_loader.py @@ -82,7 +82,10 @@ def get_module_from_file(category,field,fallback_module_name=None): value = fallback_module_name else: raise CX(_("Cannot find config file setting for: %s") % field) - return MODULE_CACHE.get(value, None) + rc = MODULE_CACHE.get(value, None) + if rc is None: + raise CX(_("Failed to load module for %s/%s") % (category,field)) + return rc def get_modules_in_category(category): if not MODULES_BY_CATEGORY.has_key(category): |