diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-12 14:15:40 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-12 14:15:40 -0400 |
| commit | bdcdc5b244ea5deb35ff92787e1fb4068968d9dd (patch) | |
| tree | d3be942454bcb6fa8cd44447e6054cd37a9a8821 | |
| parent | 402ff49f5dd70671575e25d5224792f59a0c8408 (diff) | |
| download | third_party-cobbler-bdcdc5b244ea5deb35ff92787e1fb4068968d9dd.tar.gz third_party-cobbler-bdcdc5b244ea5deb35ff92787e1fb4068968d9dd.tar.xz third_party-cobbler-bdcdc5b244ea5deb35ff92787e1fb4068968d9dd.zip | |
Apply patch to remove anti-createrepo conditions, bump version.
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cobbler.spec | 5 | ||||
| -rw-r--r-- | cobbler/action_reposync.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,6 +1,9 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +- Mon May 12 2008 - 0.9.2 +- run createrepo with less preconditions during cobbler reposync + - Fri May 09 2008 - 0.9.1 - patch to allow yumopts to override gpgcheck - applied patch to send hostname from ISC diff --git a/cobbler.spec b/cobbler.spec index 5b23ec2..51ea3aa 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -188,6 +188,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 12 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.2-1 +- Upstream changes (see CHANGELOG) + * Fri May 09 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.1-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index d6b30bc..495aa3a 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -285,7 +285,7 @@ class RepoSync: """ Used to run createrepo on a copied mirror. """ - if os.path.exists(os.path.join(dirname,"RPMS")) or repo.is_rsync_mirror(): + if os.path.exists(dirname) or repo.is_rsync_mirror(): utils.remove_yum_olddata(dirname) try: cmd = "createrepo %s %s" % (repo.createrepo_flags, dirname) @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.9.1" +VERSION = "0.9.2" SHORT_DESC = "Network Boot and Update Server" LONG_DESC = """ Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP Management. Cobbler has a Python API for integration with other GPL systems management applications. |