This patch fixes the cobbler 1.2 git master branch and (I beleive) the
src rpm.
Cheers
Dave Hatton
>From 2a432ff4b3dedb9ad59b2cdced1d11d1aa619277 Mon Sep 17 00:00:00 2001
From: Dave Hatton <[EMAIL PROTECTED]>
Date: Sat, 30 Aug 2008 10:36:40 +0100
Subject: [PATCH] fix failed merge
---
CHANGELOG | 4 ----
cobbler/api.py | 10 +++-------
cobbler/remote.py | 3 ---
cobbler/services.py | 4 ----
cobbler/utils.py | 23 -----------------------
5 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3de72bb..e99145c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -135,20 +135,16 @@ Cobbler CHANGELOG
- add Xen FV and VMware virt types to WebUI
- Wed Jun 03 2008 - 1.0.3
->>>>>>> devel:CHANGELOG
- Fix typo in replicate code
- remove rhpl reference
- scrub references to manage_*_mode and rewrite the restart-services trigger
- add new settings to control whether the restart-trigger restarts things
- yum reposync should also pull i686 kernels, not just i386
- make cobblerd close file handles
-<<<<<<< HEAD:CHANGELOG
- fix kickstart serving when the tree is on NFS
- fix missing reposync createdir (also now in stable branch)
- add back missing remove_profile/remove_repo
- remove profile_change support
-=======
->>>>>>> devel:CHANGELOG
- Mon Jun 09 2008 - 1.0.2
- Fix mkdir invocation
diff --git a/cobbler/api.py b/cobbler/api.py
index dfcf07a..8f8b692 100644
--- a/cobbler/api.py
+++ b/cobbler/api.py
@@ -200,19 +200,15 @@ class BootAPI:
self.log("remove_distro",[ref.name])
return self._config.distros().remove(ref.name, recursive=recursive)
- def remove_profile(self,ref, recursive=False):
+ def remove_profile(self, ref, recursive=False):
self.log("remove_profile",[ref.name])
return self._config.profiles().remove(ref.name, recursive=recursive)
-<<<<<<< HEAD:cobbler/api.py
- def remove_system(self,ref,recursive=False):
-=======
- def remove_system(self,ref, recursive=False):
->>>>>>> devel:cobbler/api.py
+ def remove_system(self, ref, recursive=False):
self.log("remove_system",[ref.name])
return self._config.systems().remove(ref.name)
- def remove_repo(self, ref,recursive=False):
+ def remove_repo(self, ref, recursive=False):
self.log("remove_repo",[ref.name])
return self._config.repos().remove(ref.name)
diff --git a/cobbler/remote.py b/cobbler/remote.py
index fd33058..dcff604 100644
--- a/cobbler/remote.py
+++ b/cobbler/remote.py
@@ -209,9 +209,6 @@ class CobblerXMLRPCInterface:
self.log("get_settings",token=token)
return self.__get_all("settings")
-<<<<<<< HEAD:cobbler/remote.py
- def register_mac(self,mac,profile,token=None):
-=======
def get_repo_config_for_profile(self,profile_name,**rest):
"""
Return the yum configuration a given profile should use to obtain
diff --git a/cobbler/services.py b/cobbler/services.py
index b3bb48d..a9f6899 100644
--- a/cobbler/services.py
+++ b/cobbler/services.py
@@ -174,11 +174,7 @@ class CobblerSvc(object):
if system is not None:
url = "%s/cblr/svc/op/ks/system/%s" % (serverseg, name)
elif profile is not None:
-<<<<<<< HEAD:cobbler/services.py
- url = "%s/cblr/svc/op/ks/system/%s" % (serverseg, name)
-=======
url = "%s/cblr/svc/op/ks/profile/%s" % (serverseg, name)
->>>>>>> devel:cobbler/services.py
else:
name = self.autodetect(**rest)
if name.startswith("FAILED"):
diff --git a/cobbler/utils.py b/cobbler/utils.py
index 28b8ad7..b342b15 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -34,10 +34,7 @@ import errno
import logging
import shutil
import tempfile
-<<<<<<< HEAD:cobbler/utils.py
-=======
import signal
->>>>>>> devel:cobbler/utils.py
from cexceptions import *
import codes
@@ -106,21 +103,6 @@ def log_exc(logger):
logger.info("Exception value: %s" % v)
logger.info("Exception Info:\n%s" %
string.join(traceback.format_list(traceback.extract_tb(tb))))
-
-<<<<<<< HEAD:cobbler/utils.py
-def print_exc(exc,full=False):
- (t, v, tb) = sys.exc_info()
- try:
- getattr(exc, "from_cobbler")
- print >> sys.stderr, str(exc)[1:-1]
- except:
- print >> sys.stderr, t
- print >> sys.stderr, v
- if full:
- print >> sys.stderr,
string.join(traceback.format_list(traceback.extract_tb(tb)))
- return 1
-
-=======
def get_exc(exc,full=True):
(t, v, tb) = sys.exc_info()
buf = ""
@@ -141,13 +123,11 @@ def print_exc(exc,full=False):
return buf
def cheetah_exc(exc,full=False):
-
lines = get_exc(exc).split("\n")
buf = ""
for l in lines:
buf = buf + "# %s\n" % l
return CHEETAH_ERROR_DISCLAIMER + buf
->>>>>>> devel:cobbler/utils.py
def trace_me():
x = traceback.extract_stack()
@@ -858,8 +838,6 @@ def set_arch(self,arch):
return True
raise CX(_("arch choices include: x86, x86_64, s390x and ia64"))
-<<<<<<< HEAD:cobbler/utils.py
-=======
def set_os_version(self,os_version):
if os_version is None:
raise CX(_("invalid value for --os-version, see manpage"))
@@ -883,7 +861,6 @@ def set_breed(self,breed):
nicer = ", ".join(valid_breeds)
raise CX(_("invalid value for --breed, must be one of %s, different breeds
have different levels of support") % nicer)
->>>>>>> devel:cobbler/utils.py
def set_repos(self,repos,bypass_check=False):
# WARNING: hack
repos = fix_mod_python_select_submission(repos)
--
1.5.4.1
_______________________________________________
cobbler mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler
