diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-10-17 16:33:45 -0400 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-17 16:33:45 -0400 |
| commit | a1c4c4f24b1d0beb5cf7e6b07e36ab95626ac585 (patch) | |
| tree | aa316523405d30706036c61c9c814a964a17b116 | |
| parent | 6e4c8456fe7e11595593a2568c10653dedc287f4 (diff) | |
| download | third_party-cobbler-a1c4c4f24b1d0beb5cf7e6b07e36ab95626ac585.tar.gz third_party-cobbler-a1c4c4f24b1d0beb5cf7e6b07e36ab95626ac585.tar.xz third_party-cobbler-a1c4c4f24b1d0beb5cf7e6b07e36ab95626ac585.zip | |
Bumping rev for no-Cheetah build.
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | cobbler.spec | 6 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -1,6 +1,10 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +* Tue Oct 17 2006 - 0.2.6-1 +- Removing Cheetah and replacing w/ simpler templating system +- Don't delete localmirror on sync + * Mon Oct 16 2006 - 0.2.5-1 - New "import" feature for rsync:// mirrors and filesystem directories - Manpage clarification diff --git a/cobbler.spec b/cobbler.spec index 8834b2f..1eac143 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler -Version: 0.2.5 +Version: 0.2.6 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -10,7 +10,6 @@ Group: Applications/System Requires: python >= 2.3 Requires: httpd Requires: tftp-server -Requires: python-cheetah Requires: pexpect BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -56,6 +55,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1 +- Upstream changes (see CHANGELOG), includes removing Cheetah as a require + * Mon Oct 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1 - Upstream features and bugfixes (see CHANGELOG) - Packaged additional kickstart file and specfile cleanup diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index e1c7de2..23e5660 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -144,7 +144,7 @@ class BootSync: } for x in metadata.keys(): template_data = template_data.replace("$%s" % x, metadata[x]) - self.tee(f1,str(t)) + self.tee(f1,template_data) self.close_file(f1) def configure_httpd(self): @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.2.5" +VERSION = "0.2.6" SHORT_DESC = "Boot server configurator" LONG_DESC = """ Cobbler is a command line tool for simplified configuration of boot/provisioning servers. It is also accessible as a Python library. Cobbler supports PXE, Xen, and re-provisioning an existing Linux system via auto-kickstart. The last two modes require 'koan' to be run on the remote system. |