summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cobbler/remote.py4
-rw-r--r--cobbler/webui/CobblerWeb.py4
-rwxr-xr-xscripts/index.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/cobbler/remote.py b/cobbler/remote.py
index 221cf0c..57570aa 100644
--- a/cobbler/remote.py
+++ b/cobbler/remote.py
@@ -870,7 +870,7 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface):
"""
self.log("remove_distro",name=name,token=token)
self.check_access(token, "remove_distro", name)
- rc = self.api._config.distros().remove(name,recursive)
+ rc = self.api._config.distros().remove(name,recursive=True)
return rc
def remove_profile(self,name,token,recursive=1):
@@ -880,7 +880,7 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface):
"""
self.log("remove_profile",name=name,token=token)
self.check_access(token, "remove_profile", name)
- rc = self.api._config.profiles().remove(name,recursive)
+ rc = self.api._config.profiles().remove(name,recursive=True)
return rc
def remove_system(self,name,token):
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index 4230546..9a0cf90 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -183,7 +183,7 @@ class CobblerWeb(object):
# handle deletes as a special case
if new_or_edit == 'edit' and delete1 and delete2:
try:
- self.remote.remove_distro(name,self.token)
+ self.remote.remove_distro(name,self.token,1) # recursive
except Exception, e:
return self.error_page("could not delete %s, %s" % (name,str(e)))
return self.distro_list()
@@ -463,7 +463,7 @@ class CobblerWeb(object):
# handle deletes as a special case
if new_or_edit == 'edit' and delete1 and delete2:
try:
- self.remote.remove_profile(name,self.token)
+ self.remote.remove_profile(name,self.token,1)
except Exception, e:
return self.error_page("could not delete %s, %s" % (name,str(e)))
return self.profile_list()
diff --git a/scripts/index.py b/scripts/index.py
index c8e59bc..d32a3a6 100755
--- a/scripts/index.py
+++ b/scripts/index.py
@@ -20,7 +20,7 @@ import xmlrpclib
import cgi
from cobbler.webui import CobblerWeb
-XMLRPC_SERVER = "http://127.0.0.1/cobbler_api_rw"
+XMLRPC_SERVER = "http://127.0.0.1:25152" # was http://127.0.0.1/cobbler_api_rw"
#=======================================