Hello community, here is the log from the commit of package cobbler for openSUSE:11.4 checked in at Fri Feb 18 14:01:47 CET 2011. -------- --- old-versions/11.4/all/cobbler/cobbler.changes 2011-02-08 12:46:06.000000000 +0100 +++ /mounts/work_src_done/11.4/cobbler/cobbler.changes 2011-02-17 17:25:32.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 17 17:21:19 CET 2011 - ug@suse.de + +- fixed the restarting of services on SUSE + +------------------------------------------------------------------- +Thu Feb 17 10:22:50 CET 2011 - ug@suse.de + +- missing rc-script link added + +------------------------------------------------------------------- +Wed Feb 16 16:34:02 CET 2011 - ug@suse.de + +- don't add "#raw" comment per default anymore + +------------------------------------------------------------------- +Wed Feb 16 13:30:07 CET 2011 - ug@suse.de + +- cobbler failed to export kickstart profiles with $SNIPPET(...) + cheetah_class_fix.diff added for that + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- cheetah_class_fix.diff lazy_suse_sync.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.v2wUXw/_old 2011-02-18 14:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.v2wUXw/_new 2011-02-18 14:01:37.000000000 +0100 @@ -27,7 +27,7 @@ License: GPLv2+ AutoReq: no Version: 2.0.10 -Release: 4 +Release: 15.<RELEASE2> Source0: cobbler-%{version}.tar.gz Source1: vendor-files.tar.bz2 Patch0: fix-initscript.dif @@ -40,6 +40,8 @@ Patch16: build_iso.diff Patch17: koan-install_tree.diff Patch18: setup_py.diff +Patch19: cheetah_class_fix.diff +Patch20: lazy_suse_sync.diff #Patch100: importer.diff Group: Applications/System @@ -135,6 +137,8 @@ %patch16 %patch17 %patch18 +%patch19 +%patch20 #%patch100 mv vendor-files/cobbler.1.gz docs @@ -151,6 +155,8 @@ mkdir -p $RPM_BUILD_ROOT/srv/www/logs %endif %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX +mkdir -p $RPM_BUILD_ROOT/usr/sbin +ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd #%if 0%{?suse_version} >= 1000 #mv $RPM_BUILD_ROOT/etc/httpd/conf.d/* $RPM_BUILD_ROOT/etc/apache2/vhosts.d/ #%endif @@ -252,6 +258,7 @@ /srv/www/cobbler/web/index.html %dir /srv/www/cobbler/svc/ /srv/www/cobbler/svc/* +%{_sbindir}/rccobblerd %defattr(755,root,root) %dir /usr/share/cobbler ++++++ autoyast1.diff ++++++ --- /var/tmp/diff_new_pack.v2wUXw/_old 2011-02-18 14:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.v2wUXw/_new 2011-02-18 14:01:37.000000000 +0100 @@ -61,8 +61,8 @@ + + document = xml.dom.minidom.parseString(raw_data) + -+ # do we already have the #raw comment in the XML? -+ addComment = 1 ++ # do we already have the #raw comment in the XML? (addComment = 0 means, don't add #raw comment) ++ addComment = 0 + for node in document.childNodes[1].childNodes: + if node.nodeType == node.COMMENT_NODE and node.data.find("#end raw") != -1: + addComment = 0 ++++++ cheetah_class_fix.diff ++++++ --- cobbler/templar.py +++ cobbler/templar.py 2011/02/16 11:55:30 @@ -33,10 +33,8 @@ import time import Cheetah -major, minor, release = Cheetah.Version.split('.') -fix_cheetah_class = False -if major >= 2 and minor >=4 and release >= 2: - fix_cheetah_class = True +major, minor, release = Cheetah.Version.split('.')[0:3] +fix_cheetah_class = int(major) >= 2 and int(minor) >=4 and int(release) >= 2 try: import functools ++++++ lazy_suse_sync.diff ++++++ --- cobbler/modules/sync_post_restart_services.py +++ cobbler/modules/sync_post_restart_services.py 2011/02/17 16:20:30 @@ -41,10 +41,10 @@ if rc != 0: logger.error("dhcpd -t failed") return 1 - rc = utils.subprocess_call(logger,"/etc/rc.d/init.d/dhcpd restart", shell=True) + rc = utils.subprocess_call(logger,"/etc/init.d/dhcpd restart", shell=True) elif which_dhcp_module == "manage_dnsmasq": if restart_dhcp != "0": - rc = utils.subprocess_call(logger, "/etc/rc.d/init.d/dnsmasq restart") + rc = utils.subprocess_call(logger, "/etc/init.d/dnsmasq restart") has_restarted_dnsmasq = True else: logger.error("unknown DHCP engine: %s" % which_dhcp_module) @@ -52,9 +52,9 @@ if manage_dns != "0" and restart_dns != "0": if which_dns_module == "manage_bind": - rc = utils.subprocess_call(logger, "/etc/rc.d/init.d/named restart", shell=True) + rc = utils.subprocess_call(logger, "/etc/init.d/named restart", shell=True) elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq: - rc = utils.subprocess_call(logger, "/etc/rc.d/init.d/dnsmasq restart", shell=True) + rc = utils.subprocess_call(logger, "/etc/init.d/dnsmasq restart", shell=True) elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq: rc = 0 else: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org