summaryrefslogtreecommitdiffstats
path: root/cobbler
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-04 11:11:34 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-04 11:11:34 -0400
commit04a40447212e77a3633763340f3553905e306aae (patch)
tree478d83609d0df9e6c3fe155942cf88683b7b04de /cobbler
parentaa1911fef63c57071180d614699b1a2c27f003db (diff)
downloadthird_party-cobbler-04a40447212e77a3633763340f3553905e306aae.tar.gz
third_party-cobbler-04a40447212e77a3633763340f3553905e306aae.tar.xz
third_party-cobbler-04a40447212e77a3633763340f3553905e306aae.zip
apply fixes
Diffstat (limited to 'cobbler')
-rw-r--r--cobbler/collection.py4
-rw-r--r--cobbler/templar.py3
2 files changed, 4 insertions, 3 deletions
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: