diff options
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | cobbler.spec | 7 | ||||
| -rw-r--r-- | cobbler/action_reposync.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rw-r--r-- | setup.py | 2 |
5 files changed, 15 insertions, 7 deletions
@@ -1,7 +1,12 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* XXX Feb XX 2008 - 0.8.0 (TBD) +* Wed Feb 20 2008 - 0.8.1 +- bugfix in reposync code +- don't print tracebacks on SystemExit from optparse +- manpage tweaks + +* Fri Feb 15 2008 - 0.8.0 (TBD) - stable release of 0.7.* branch plus ... - fixed potential user problem with source_repos in upgrade scenario - additional higher level API functions for find, fixes for other higher level API functions diff --git a/cobbler.spec b/cobbler.spec index 13873a8..f5fc370 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,8 +2,8 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.0 -Release: 2%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -190,6 +190,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 20 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.1-1 +- Upstream changes (see CHANGELOG) + * Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-2 - Fix egg packaging diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index 6e62489..462da47 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -244,7 +244,7 @@ class RepoSync: config_file.write("%s=%s\n" % (x, repo.yumopts[x])) else: line = "baseurl=%s\n" % repo.mirror - http_server = self.settings.server + ":" + self.settings.http_port + http_server = "%s:%s" % (self.settings.server, self.settings.http_port) line = line.replace("@@server@@",http_server) config_file.write(line) config_file.write("enabled=1\n") diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 2e542e8..a4485ac 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1203105321.7213049 -__CHEETAH_genTimestamp__ = 'Fri Feb 15 14:55:21 2008' +__CHEETAH_genTime__ = 1203536023.5055339 +__CHEETAH_genTimestamp__ = 'Wed Feb 20 14:33:43 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.8.0" +VERSION = "0.8.1" 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. |