From 933d36ae2243bd1827459b26a6c7784b084aeb84 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Tue, 6 Nov 2007 17:06:38 -0500
Subject: Removing yum-utils as a package requirement because the version in
 EPEL does not contain reposync or yumdownloader.  Given that, we will now
 have cobbler check looking for it, and warning about it being missing, rather
 than making it a hard requirement.

---
 CHANGELOG               | 1 +
 cobbler.spec            | 2 +-
 cobbler/action_check.py | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c110e51..519b45d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ Cobbler CHANGELOG
 - webui now uses htaccess (see manpage)
 - added pagination to the WUI to keep pages from growing overly long
 - added --server-override parameter for help with multi-subnet configurations
+- removed yum-utils as a hard requirement, cobbler check now looks for yum-utils
 
 * Fri Sep 28 2007 - 0.6.2
 - cobbler repo auto-add to discover yum repos automatically
diff --git a/cobbler.spec b/cobbler.spec
index 26a5d62..0cad7ff 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -13,7 +13,6 @@ Requires: python-devel
 Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
-Requires: yum-utils
 Requires: rhpl
 %ifarch i386 i686 x86_64
 Requires: syslinux
@@ -199,6 +198,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 - backup state files on upgrade 
 - cobbler sync now has pre/post triggers, so package those dirs/files
 - WebUI now has .htaccess file
+- removed yum-utils as a requirement
 
 * Fri Sep 28 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.2-2
 - Upstream changes (see CHANGELOG)
diff --git a/cobbler/action_check.py b/cobbler/action_check.py
index 93988a3..f7bc9d9 100644
--- a/cobbler/action_check.py
+++ b/cobbler/action_check.py
@@ -55,6 +55,7 @@ class BootCheck:
        self.check_tftpd_conf(status)
        self.check_httpd(status)
        self.check_iptables(status)
+       self.check_yum(status)
 
        return status
 
@@ -70,6 +71,14 @@ class BootCheck:
            if rc == 0:
               status.append(_("since iptables may be running, ensure 69, 80, %(syslog)s, and %(xmlrpc)s are unblocked") % { "syslog" : self.settings.syslog_port, "xmlrpc" : self.settings.xmlrpc_port })
 
+   def check_yum(self,status):
+       if not os.path.exists("/usr/bin/createrepo"):
+           status.append(_("createrepo package is not installed, needed for cobbler import and cobbler reposync, install createrepo?"))
+       if not os.path.exists("/usr/bin/reposync"):
+           status.append(_("reposync is not installed, need for cobbler reposync, install/upgrade yum-utils?"))
+       if not os.path.exists("/usr/bin/yumdownloader"):
+           status.append(_("yumdownloader is not installed, needed for cobbler repo add with --rpm-list parameter, install/upgrade yum-utils?"))
+
    def check_name(self,status):
        """
        If the server name in the config file is still set to localhost
-- 
cgit