diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | cobbler.spec | 2 | ||||
| -rw-r--r-- | cobbler/collection.py | 4 | ||||
| -rw-r--r-- | cobbler/templar.py | 3 |
4 files changed, 6 insertions, 4 deletions
@@ -10,6 +10,7 @@ Cobbler CHANGELOG - Do not cache snippets so they can be tweaked w/o starting the service - Make manpage reference /etc/cobbler/settings, not /var/lib - Added manage_forward_zones/manage_reverse_zones to included config file +- Fix python double-use-of-parameter error - Wed May 27 2008 - 1.0.0 - Merge devel branch onto master, this is 1.0 diff --git a/cobbler.spec b/cobbler.spec index ba26c08..4370a54 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System diff --git a/cobbler/collection.py b/cobbler/collection.py index 6044993..df866ee 100644 --- a/cobbler/collection.py +++ b/cobbler/collection.py @@ -126,10 +126,10 @@ class Collection(serializable.Serializable): k.set_parent(newname) else: k.set_distro(newname) - self.api.profiles().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers,save=True) + self.api.profiles().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers) elif k.COLLECTION_TYPE == "system": k.set_profile(newname) - self.api.systems().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers,save=True) + self.api.systems().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers) elif k.COLLECTION_TYPE == "repo": raise CX(_("internal error, not expected to have repo child objects")) else: diff --git a/cobbler/templar.py b/cobbler/templar.py index b41b471..edfd5f2 100644 --- a/cobbler/templar.py +++ b/cobbler/templar.py @@ -17,9 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import os import os.path import glob -import utils from cexceptions import * from Cheetah.Template import Template +from utils import * +import utils class Templar: |