summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-09 16:45:38 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-09 16:45:38 -0400
commit808f53e2c8c137778c8c1beea27c1668e8786d6e (patch)
tree2be90d8a81f4ded1bfb54f0817b1ea568448c36d
parent8808ac797cbbd26dfb2a9b2e76f668ea42d3827a (diff)
downloadthird_party-cobbler-808f53e2c8c137778c8c1beea27c1668e8786d6e.zip
third_party-cobbler-808f53e2c8c137778c8c1beea27c1668e8786d6e.tar.gz
third_party-cobbler-808f53e2c8c137778c8c1beea27c1668e8786d6e.tar.xz
Fix for mkdir invocation now that we no longer own the tftp directories in the RPM.
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler.spec5
-rw-r--r--cobbler/action_sync.py4
-rw-r--r--setup.py2
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ed82f19..2e0d2ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
-- Wed Jun 03 2008 - 1.0.3
+- Mon Jun 09 2008 - 1.0.2
+- Fix mkdir invocation
- Fix error message output from failed kickstart rendering
- manpage edits
diff --git a/cobbler.spec b/cobbler.spec
index cb249f1..ec38ae2 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 1.0.3
+Version: 1.0.2
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
@@ -190,6 +190,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jun 04 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.2-1
+- Upsteram changes (see CHANGELOG)
+
* Tue Jun 03 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.1-1
- Upstream changes (see CHANGELOG)
- stop owning files in tftpboot
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index fab96a6..4b72928 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -132,9 +132,9 @@ class BootSync:
pxelinux_dir = os.path.join(self.bootloc, "pxelinux.cfg")
images_dir = os.path.join(self.bootloc, "images")
if not os.path.exists(pxelinux_dir):
- utils.makedir(pxelinux_dir)
+ utils.mkdir(pxelinux_dir)
if not os.path.exists(images_dir):
- utils.makedir(images_dir)
+ utils.mkdir(images_dir)
utils.rmtree_contents(os.path.join(self.bootloc, "pxelinux.cfg"))
utils.rmtree_contents(os.path.join(self.bootloc, "images"))
diff --git a/setup.py b/setup.py
index 680f22c..dc087d7 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
from distutils.core import setup, Extension
import string
-VERSION = "1.0.3"
+VERSION = "1.0.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/DNS Management. Cobbler also has a Python and XMLRPC API for integration with other applications.