Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-11-27 13:54:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Wed Nov 27 13:54:15 2019 rev:53 rq:751077 version:3.0.1+git20191120.24c4ae8e Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-11-26 17:01:11.280071644 +0100 +++ /work/SRC/openSUSE:Factory/.cobbler.new.26869/cobbler.changes 2019-11-27 13:54:54.496310558 +0100 @@ -1,0 +2,16 @@ +Tue Nov 26 15:44:24 UTC 2019 - [email protected] + +- Update to latest git HEAD code base + This version (from mainline so for quite a while already) + also includes fixes for "bsc#1149075" and bsc#1151875 + These patches are mainline already: +D kopts-utils-path.diff +D item-repo-import-fix.diff +D no-system-in-kopts-call.diff + This patch is going to be submitted mainline: +A cobbler_management_mac.diff +- Fix up manpage creation: Do not zip manpages ourselves + Thanks to namtrac. + + +------------------------------------------------------------------- Old: ---- cobbler-3.0.1+git20191025.fbebd758.tar.xz item-repo-import-fix.diff kopts-utils-path.diff no-system-in-kopts-call.diff New: ---- cobbler-3.0.1+git20191120.24c4ae8e.tar.xz cobbler_management_mac.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.bmhO8S/_old 2019-11-27 13:55:00.480308033 +0100 +++ /var/tmp/diff_new_pack.bmhO8S/_new 2019-11-27 13:55:00.496308026 +0100 @@ -25,7 +25,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global debug_package %{nil} Name: cobbler -Version: 3.0.1+git20191025.fbebd758 +Version: 3.0.1+git20191120.24c4ae8e Release: 0 Summary: Boot server configurator License: GPL-2.0-or-later @@ -39,10 +39,7 @@ Source3: fence_ipmitool.template Patch1: fix_hardcoded_libpath_for_websession.patch Patch2: exclude_get-loaders_command.patch -Patch3: kopts-utils-path.diff -Patch4: no-system-in-kopts-call.diff -Patch5: item-repo-import-fix.diff - +Patch3: cobbler_management_mac.diff BuildRequires: python3-Cheetah3 BuildRequires: apache-rpm-macros @@ -58,7 +55,6 @@ BuildRequires: python3-future BuildRequires: python3-setuptools BuildRequires: python3-Sphinx -BuildRequires: gzip BuildRequires: pkgconfig(systemd) # Workaround so that /srv/tftpboot file exists during # build, but is not owned by cobbler @@ -137,24 +133,9 @@ %python_exec setup.py build_sphinx -b man -for manpage in build/sphinx/man/*;do - if [ %{?ext_man} == ".xz" ];then - ZIPPER="xz --stdout " - elif [ %{?ext_man} == ".gz" ];then - ZIPPER="gzip --stdout " - else - ZIPPER="gzip --stdout " - fi - $ZIPPER --stdout $manpage >$manpage%{?ext_man}; -done - %install %python_install -install -D -m 0600 build/sphinx/man/cobbler-cli.1%{?ext_man} %{buildroot}%{_mandir}/man1/cobbler-cli.1%{?ext_man} -install -D -m 0600 build/sphinx/man/cobblerd.1%{?ext_man} %{buildroot}%{_mandir}/man1/cobblerd.1%{?ext_man} -install -D -m 0600 build/sphinx/man/cobbler.conf.5%{?ext_man} %{buildroot}%{_mandir}/man5/cobbler_conf.5%{?ext_man} - ln -sf service %{buildroot}%{_sbindir}/rccobblerd rm -rf %{buildroot}%{_initddir} mkdir -p %{buildroot}%{_unitdir} @@ -263,9 +244,9 @@ %{_datadir}/%{name}/bin/settings-migration-v1-to-v2.sh %{_datadir}/cobbler/web %attr(750, root, root) %{_localstatedir}/log/cobbler -%{_mandir}/man1/cobbler-cli.1%{?ext_man} -%{_mandir}/man1/cobblerd.1%{?ext_man} -%{_mandir}/man5/cobbler_conf.5%{?ext_man} +%{_mandir}/man1/cobbler.1%{?ext_man} +%{_mandir}/man5/cobbler.conf.5%{?ext_man} +%{_mandir}/man8/cobblerd.8%{?ext_man} %{_sbindir}/tftpd.py* %{_sbindir}/rccobblerd %{_sbindir}/fence_ipmitool ++++++ cobbler-3.0.1+git20191025.fbebd758.tar.xz -> cobbler-3.0.1+git20191120.24c4ae8e.tar.xz ++++++ ++++ 2358 lines of diff (skipped) ++++++ cobbler_management_mac.diff ++++++ --- a/cobbler/tftpgen.py 2019-11-22 10:48:06.917115664 +0100 +++ b/cobbler/tftpgen.py 2019-11-26 15:55:55.076953544 +0100 @@ -567,6 +543,7 @@ """ management_interface = None + management_mac = None if system is not None: blended = utils.blender(self.api, False, system) # find the first management interface @@ -574,6 +551,8 @@ for intf in list(system.interfaces.keys()): if system.interfaces[intf]["management"]: management_interface = intf + if system.interfaces[intf]["mac_address"]: + management_mac = system.interfaces[intf]["mac_address"] break except: # just skip this then @@ -637,8 +616,8 @@ append_line = append_line.replace('ksdevice=bootif', 'ksdevice=${net0/mac}') elif distro.breed == "suse": append_line = "%s autoyast=%s" % (append_line, autoinstall_path) - if management_interface: - append_line += "netdevice=%s" % management_interface + if management_mac: + append_line += " netdevice=%s" % management_mac elif distro.breed == "debian" or distro.breed == "ubuntu": append_line = "%s auto-install/enable=true priority=critical netcfg/choose_interface=auto url=%s" % (append_line, autoinstall_path) if management_interface: ++++++ fix_hardcoded_libpath_for_websession.patch ++++++ --- /var/tmp/diff_new_pack.bmhO8S/_old 2019-11-27 13:55:01.960307408 +0100 +++ /var/tmp/diff_new_pack.bmhO8S/_new 2019-11-27 13:55:01.960307408 +0100 @@ -8,11 +8,11 @@ Signed-off-by: Thomas Renninger <[email protected]> -Index: cobbler-3.0.1+git20191008.21acab67/setup.py +Index: cobbler-3.0.1+git20191120.24c4ae8e/setup.py =================================================================== ---- cobbler-3.0.1+git20191008.21acab67.orig/setup.py 2019-10-08 16:08:04.000000000 +0200 -+++ cobbler-3.0.1+git20191008.21acab67/setup.py 2019-10-08 16:36:37.312552860 +0200 -@@ -304,10 +304,6 @@ class install(_install): +--- cobbler-3.0.1+git20191120.24c4ae8e.orig/setup.py 2019-11-20 20:24:53.000000000 +0100 ++++ cobbler-3.0.1+git20191120.24c4ae8e/setup.py 2019-11-26 16:14:52.964793914 +0100 +@@ -315,10 +315,6 @@ class install(_install): # Run the usual stuff. _install.run(self) @@ -23,7 +23,7 @@ # Hand over some directories to the webserver user path = os.path.join(self.install_data, 'share/cobbler/web') try: -@@ -318,9 +314,7 @@ class install(_install): +@@ -329,9 +325,7 @@ class install(_install): if not os.path.abspath(libpath): # The next line only works for absolute libpath raise Exception("libpath is not absolute.") @@ -33,4 +33,4 @@ + path = os.path.join(self.root + libpath, 'webui_sessions') try: self.change_owner(path, http_user) - except KeyError as e: + except Exception as e:
