Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2017-11-24 10:53:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Fri Nov 24 10:53:59 2017 rev:40 rq:544574 version:2.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2017-10-06 11:05:06.174347953 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2017-11-24 10:54:06.265087435 +0100 @@ -1,0 +2,17 @@ +Wed Nov 8 18:08:11 UTC 2017 - aavind...@gmail.com + +- Update to latest stable version of cobbler (2.8.2) + * many changes since 2.6.6. see: https://cobbler.github.io/posts/ +- rebase patches + * koan_old_cobbler_compat.diff + * disable_not_relevant_checks_bnc_828453.patch + * update-outdated-apache-config-bsc956264.patch + + potentionally fixed in 3d4db162c7b7c0fe7de00c30fcb81798b7db5039 +- remove fix-cobbler-loaders-server-bsc980577.patch + * fixed in 77328c0b05d37878f13704efa31e4daa162fda12 +- remove vendor-files.tar.bz2 + * use built in manpage instead of vendored one + * add cobbler_firewall_settings to package root +- use py macros to do installation + +------------------------------------------------------------------- Old: ---- cobbler-2.6.6.tar.gz fix-cobbler-loaders-server-bsc980577.patch vendor-files.tar.bz2 New: ---- cobbler-2.8.2.tar.gz cobbler_firewall_settings ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.569003281 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.573003135 +0100 @@ -40,10 +40,10 @@ Group: Applications/System Name: cobbler AutoReq: no -Version: 2.6.6 +Version: 2.8.2 Release: 1%{?dist} -Source0: cobbler-%{version}.tar.gz -Source1: vendor-files.tar.bz2 +Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: cobbler_firewall_settings Source2: fence_ipmitool.sh Source3: %{name}.changes Patch2: cobbler_web_config.diff @@ -65,8 +65,6 @@ Patch20: fix_test_create_systems.diff # PATCH-FIX-OPENSUSE update-outdated-apache-config-bsc956264.patch bsc#956264 mdi...@suse.de Patch21: update-outdated-apache-config-bsc956264.patch -# PATCH-FIX-OPENSUSE fix-cobbler-loaders-server-bsc980577.patch bsc#980577 psuarezhernan...@suse.de -Patch22: fix-cobbler-loaders-server-bsc980577.patch # PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1840 (not merged yet) Patch23: fix-os-release.patch # PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1811 (not merged yet) @@ -161,7 +159,6 @@ %prep %setup -q -%setup -a1 %if 0%{?suse_version} %patch2 %endif @@ -183,18 +180,15 @@ %patch19 -p1 %patch20 -p1 %patch21 -p0 -%patch22 -p0 %patch23 -p1 %patch24 -p1 -mv vendor-files/cobbler.1.gz docs - %build -%{__python} setup.py build +%{__python2} setup.py build %install test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX +%{__python2} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX mkdir -p $RPM_BUILD_ROOT/etc/%{apachedir}/conf.d mv config/cobbler.conf $RPM_BUILD_ROOT/etc/%{apachedir}/conf.d/ @@ -216,8 +210,8 @@ %if 0%{?suse_version} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d -mv vendor-files/cobbler_firewall_settings $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler -install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/fence_ipmitool +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/sbin/fence_ipmitool ln -sf service $RPM_BUILD_ROOT/usr/sbin/rccobblerd chmod 755 $RPM_BUILD_ROOT/usr/sbin/grubby-compat cp -r tests/ $RPM_BUILD_ROOT/usr/share/cobbler/ @@ -412,9 +406,6 @@ %config(noreplace) /etc/%{apachedir}/conf.d/cobbler.conf -%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5 || 0%{?suse_version} -%exclude %{python_sitelib}/cobbler/sub_process.py* -%endif %if 0%{?fedora} >= 9 || 0%{?rhel} > 5 || 0%{?suse_version} %{python_sitelib}/cobbler*.egg-info %if 0%{?suse_version} @@ -426,7 +417,7 @@ /tftpboot/images %endif -%doc AUTHORS README COPYING +%doc AUTHORS %if 0%{?suse_version} %config /etc/sysconfig/SuSEfirewall2.d/cobbler /usr/sbin/fence_ipmitool @@ -472,7 +463,7 @@ %{_mandir}/man1/koan.1.gz %{_mandir}/man1/cobbler-register.1.gz %dir /var/log/koan -%doc AUTHORS COPYING README +%doc AUTHORS COPYING %package -n cobbler-web @@ -503,7 +494,7 @@ %files -n cobbler-web %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING %config(noreplace) /etc/%{apachedir}/conf.d/cobbler_web.conf %defattr(-,%{apache_user},%{apache_group},-) /usr/share/cobbler/web ++++++ catch_cheetah_exception.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.617001528 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.617001528 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.4.0/bin/services.py +Index: cobbler-2.8.2/bin/services.py =================================================================== ---- cobbler-2.4.0.orig/bin/services.py -+++ cobbler-2.4.0/bin/services.py -@@ -24,6 +24,7 @@ +--- cobbler-2.8.2.orig/bin/services.py ++++ cobbler-2.8.2/bin/services.py +@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fi # available at this point. import os import urllib @@ -10,43 +10,3 @@ import cgi def application(environ, start_response): - -@@ -76,21 +77,25 @@ def application(environ, start_response) - - # Execute corresponding operation on the CobblerSvc object: - func = getattr( cw, mode ) -- content = func( **form ) -+ try: -+ content = func( **form ) - -- content = unicode(content).encode('utf-8') -- status = '200 OK' -- -- if content.find("# *** ERROR ***") != -1: -- status = '500 SERVER ERROR' -- print("possible cheetah template error") -+ content = unicode(content).encode('utf-8') -+ status = '200 OK' - -- # TODO: Not sure these strings are the right ones to look for... -- elif content.find("# profile not found") != -1 or \ -- content.find("# system not found") != -1 or \ -- content.find("# object not found") != -1: -- print("content not found: %s" % my_uri) -- status = "404 NOT FOUND" -+ if content.find("# *** ERROR ***") != -1: -+ status = '500 SERVER ERROR' -+ print("possible cheetah template error") -+ -+ # TODO: Not sure these strings are the right ones to look for... -+ elif content.find("# profile not found") != -1 or \ -+ content.find("# system not found") != -1 or \ -+ content.find("# object not found") != -1: -+ print("content not found: %s" % my_uri) -+ status = "404 NOT FOUND" -+ except xmlrpclib.Fault, (err): -+ status = '500 SERVER ERROR' -+ content = err.faultString - - # req.content_type = "text/plain;charset=utf-8" - response_headers = [('Content-type', 'text/plain;charset=utf-8'), ++++++ cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.625001236 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.629001089 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/koan/app.py +Index: cobbler-2.8.2/koan/app.py =================================================================== ---- cobbler-2.6.6.orig/koan/app.py -+++ cobbler-2.6.6/koan/app.py -@@ -942,7 +942,7 @@ class Koan: +--- cobbler-2.8.2.orig/koan/app.py ++++ cobbler-2.8.2/koan/app.py +@@ -989,7 +989,7 @@ class Koan: (make, version) = utils.os_release() @@ -11,7 +11,7 @@ # embed the initrd in the kickstart file because of libdhcp and/or pump # needing the help due to some DHCP timeout potential in some certain -@@ -1044,7 +1044,7 @@ class Koan: +@@ -1091,7 +1091,7 @@ class Koan: kickstart = self.safe_load(profile_data,'kickstart') ++++++ cobbler-2.6.6.tar.gz -> cobbler-2.8.2.tar.gz ++++++ ++++ 9794 lines of diff (skipped) ++++++ cobbler_firewall_settings ++++++ ## Name: Cobbler Daemon ## Description: Opens ports for the Cobbler Daemon. # space separated list of allowed TCP ports TCP="http https tftp 25151" # space separated list of allowed UDP ports UDP="tftp" # space separated list of allowed RPC services RPC="" # space separated list of allowed IP protocols IP="" # space separated list of allowed UDP broadcast ports BROADCAST="" ++++++ disable_not_relevant_checks_bnc_828453.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.860992616 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.860992616 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/cobbler/action_check.py +Index: cobbler-2.8.2/cobbler/action_check.py =================================================================== ---- cobbler-2.6.6.orig/cobbler/action_check.py -+++ cobbler-2.6.6/cobbler/action_check.py -@@ -100,7 +100,7 @@ class BootCheck: +--- cobbler-2.8.2.orig/cobbler/action_check.py ++++ cobbler-2.8.2/cobbler/action_check.py +@@ -99,7 +99,7 @@ class BootCheck: return status def check_for_ksvalidator(self, status): @@ -11,7 +11,7 @@ return if not os.path.exists("/usr/bin/ksvalidator"): -@@ -109,6 +109,9 @@ class BootCheck: +@@ -108,6 +108,9 @@ class BootCheck: return True def check_for_cman(self, status): @@ -21,8 +21,8 @@ # not doing rpm -q here to be cross-distro friendly if not os.path.exists("/sbin/fence_ilo") and not os.path.exists("/usr/sbin/fence_ilo"): status.append("fencing tools were not found, and are required to use the (optional) power management features. install cman or fence-agents to use them") -@@ -180,6 +183,9 @@ class BootCheck: - status.append(_("yum-utils need to be at least version 1.1.17 for reposync -l, current version is %s") % yum_utils_ver ) +@@ -175,6 +178,9 @@ class BootCheck: + status.append(_("yumdownloader is not installed, install yum-utils or dnf-plugins-core")) def check_debmirror(self,status): + if self.checked_dist == "suse": @@ -31,7 +31,7 @@ if not os.path.exists("/usr/bin/debmirror"): status.append(_("debmirror package is not installed, it will be required to manage debian deployments and repositories")) if os.path.exists("/etc/debmirror.conf"): -@@ -218,6 +224,9 @@ class BootCheck: +@@ -213,6 +219,9 @@ class BootCheck: status.append(_("SELinux is enabled. Please review the following wiki page for details on ensuring cobbler works correctly in your SELinux environment:\n https://github.com/cobbler/cobbler/wiki/Selinux";)) def check_for_default_password(self,status): ++++++ do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.872992177 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.876992031 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/koan/app.py +Index: cobbler-2.8.2/koan/app.py =================================================================== ---- cobbler-2.6.6.orig/koan/app.py -+++ cobbler-2.6.6/koan/app.py -@@ -1029,9 +1029,12 @@ class Koan: +--- cobbler-2.8.2.orig/koan/app.py ++++ cobbler-2.8.2/koan/app.py +@@ -1076,9 +1076,12 @@ class Koan: raise InfoException, "grub2 is not installed" use_grub2 = True elif (make == "suse"): @@ -18,7 +18,7 @@ else: if not os.path.exists("/sbin/grubby"): raise InfoException, "grubby is not installed" -@@ -1179,10 +1182,13 @@ class Koan: +@@ -1226,10 +1229,13 @@ class Koan: # Set paths for Ubuntu/Debian # TODO: Add support for other distros when they ship grub2 ++++++ fix-broken-tests.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.892991446 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.896991301 +0100 @@ -1,7 +1,6 @@ -diff --git a/tests/distro_test.py b/tests/distro_test.py -deleted file mode 100644 -index f763f66..0000000 ---- a/tests/distro_test.py +Index: cobbler-2.8.2/tests/distro_test.py +=================================================================== +--- cobbler-2.8.2.orig/tests/distro_test.py +++ /dev/null @@ -1,65 +0,0 @@ -""" @@ -69,7 +68,9 @@ - # Just want to be sure no 404 HTTPError is thrown: - response = urllib2.urlopen(url) - ---- a/tests/profile_test.py +Index: cobbler-2.8.2/tests/profile_test.py +=================================================================== +--- cobbler-2.8.2.orig/tests/profile_test.py +++ /dev/null @@ -1,53 +0,0 @@ -""" @@ -125,6 +126,3 @@ - self.fail() - except urllib2.HTTPError, e: - self.assertEquals(404, e.code) --- -2.1.2 - ++++++ fix-koan-port-guessing.dif ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.904991008 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.904991008 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.4.2/koan/utils.py +Index: cobbler-2.8.2/koan/utils.py =================================================================== ---- cobbler-2.4.2.orig/koan/utils.py -+++ cobbler-2.4.2/koan/utils.py -@@ -450,15 +450,20 @@ def connect_to_server(server=None,port=N +--- cobbler-2.8.2.orig/koan/utils.py ++++ cobbler-2.8.2/koan/utils.py +@@ -458,15 +458,20 @@ def connect_to_server(server=None,port=N if server == "": raise InfoException("--server must be specified") ++++++ fix-os-release.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.912990716 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.912990716 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/setup.py +Index: cobbler-2.8.2/setup.py =================================================================== ---- cobbler-2.6.6.orig/setup.py -+++ cobbler-2.6.6/setup.py -@@ -508,6 +508,18 @@ class savestate(statebase): +--- cobbler-2.8.2.orig/setup.py ++++ cobbler-2.8.2/setup.py +@@ -506,6 +506,18 @@ class savestate(statebase): self._copy(os.path.join(etcpath, 'rsync.template'), self.statepath) @@ -14,14 +14,14 @@ + out.update( + map( + lambda line: [it.strip('"\n') for it in line.split('=', 1)], -+ [line for line in os_release.xreadlines() if not line.startswith('#')] ++ [line for line in os_release.xreadlines() if not line.startswith('#') and '=' in line] + ) + ) + return out -@@ -526,7 +538,13 @@ if __name__ == "__main__": +@@ -524,7 +536,13 @@ if __name__ == "__main__": logpath = "/var/log/" statepath = "/tmp/cobbler_settings/devinstall" ++++++ fix-powermanagement-status.dif ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.924990278 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.924990278 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/cobbler/action_power.py +Index: cobbler-2.8.2/cobbler/action_power.py =================================================================== ---- cobbler-2.6.6.orig/cobbler/action_power.py -+++ cobbler-2.6.6/cobbler/action_power.py -@@ -104,17 +104,15 @@ class PowerTool: +--- cobbler-2.8.2.orig/cobbler/action_power.py ++++ cobbler-2.8.2/cobbler/action_power.py +@@ -102,17 +102,15 @@ class PowerTool: if rc == 0: # If the desired state is actually a query for the status # return different information than command return code ++++++ fix-restart-paravirt-xen.dif ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.940989694 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.940989694 +0100 @@ -1,7 +1,7 @@ -Index: cobbler-2.6.6/koan/app.py +Index: cobbler-2.8.2/koan/app.py =================================================================== ---- cobbler-2.6.6.orig/koan/app.py -+++ cobbler-2.6.6/koan/app.py +--- cobbler-2.8.2.orig/koan/app.py ++++ cobbler-2.8.2/koan/app.py @@ -62,6 +62,10 @@ import socket import utils import time @@ -13,7 +13,7 @@ COBBLER_REQUIRED = 1.300 -@@ -1526,7 +1530,9 @@ class Koan: +@@ -1596,7 +1600,9 @@ class Koan: return "failed" elif state == "shutdown": print "- shutdown VM detected, is the install done? Restarting!" @@ -24,7 +24,7 @@ return results else: raise InfoException("internal error, bad virt state") -@@ -1546,6 +1552,48 @@ class Koan: +@@ -1616,6 +1622,48 @@ class Koan: #--------------------------------------------------- ++++++ fix-script-endpoint-security-bug-1030582.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.952989255 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.956989109 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/cobbler/pxegen.py +Index: cobbler-2.8.2/cobbler/pxegen.py =================================================================== ---- cobbler-2.6.6.orig/cobbler/pxegen.py -+++ cobbler-2.6.6/cobbler/pxegen.py -@@ -1256,9 +1256,16 @@ class PXEGen: +--- cobbler-2.8.2.orig/cobbler/pxegen.py ++++ cobbler-2.8.2/cobbler/pxegen.py +@@ -1158,9 +1158,16 @@ class PXEGen: else: blended['img_path'] = os.path.join("/images",distro.name) ++++++ fix_sle_detection.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.964988817 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.964988817 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-2.6.6/cobbler/utils.py +Index: cobbler-2.8.2/cobbler/utils.py =================================================================== ---- cobbler-2.6.6.orig/cobbler/utils.py -+++ cobbler-2.6.6/cobbler/utils.py -@@ -1001,7 +1001,10 @@ def check_dist(): +--- cobbler-2.8.2.orig/cobbler/utils.py ++++ cobbler-2.8.2/cobbler/utils.py +@@ -983,7 +983,10 @@ def check_dist(): """ import platform try: ++++++ fix_test_create_systems.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.976988378 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.976988378 +0100 @@ -1,7 +1,7 @@ -Index: cobbler-2.6.6/tests/base.py +Index: cobbler-2.8.2/tests/base.py =================================================================== ---- cobbler-2.6.6.orig/tests/base.py -+++ cobbler-2.6.6/tests/base.py +--- cobbler-2.8.2.orig/tests/base.py ++++ cobbler-2.8.2/tests/base.py @@ -56,7 +56,7 @@ FAKE_TEMPLATE_CONTENTS = "HELLO WORLD" # These will be created if they don't already exist. FAKE_KERNEL = "/tmp/cobbler-testing-fake-kernel" ++++++ grubby-compat.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.984988086 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.984988086 +0100 @@ -64,7 +64,7 @@ =================================================================== --- koan/app.py.orig +++ koan/app.py -@@ -988,7 +988,11 @@ class Koan: +@@ -1035,7 +1035,11 @@ class Koan: return (0, "grub") else: return (0, "lilo") @@ -77,7 +77,7 @@ probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE) which_loader = probe_process.communicate()[0] return probe_process.returncode, which_loader -@@ -1014,11 +1018,16 @@ class Koan: +@@ -1061,11 +1065,16 @@ class Koan: def after_download(self, profile_data): use_grubby = False use_grub2 = False @@ -94,7 +94,7 @@ else: if not os.path.exists("/sbin/grubby"): raise InfoException, "grubby is not installed" -@@ -1076,7 +1085,7 @@ class Koan: +@@ -1123,7 +1132,7 @@ class Koan: cmd.append("--copy-default") boot_probe_ret_code, probe_output = self.get_boot_loader_info() @@ -103,7 +103,7 @@ cmd.append("--lilo") if self.add_reinstall_entry: -@@ -1126,10 +1135,32 @@ class Koan: +@@ -1173,10 +1182,32 @@ class Koan: else: # if grubby --bootloader-probe returns lilo, # apply lilo changes @@ -142,7 +142,7 @@ =================================================================== --- setup.py.orig +++ setup.py -@@ -607,7 +607,7 @@ if __name__ == "__main__": +@@ -605,7 +605,7 @@ if __name__ == "__main__": ], data_files = [ # tftpd, hide in /usr/sbin ++++++ koan_old_cobbler_compat.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.992987794 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.992987794 +0100 @@ -2,12 +2,12 @@ =================================================================== --- koan/virtinstall.py.orig +++ koan/virtinstall.py -@@ -110,7 +110,7 @@ def _sanitize_nics(nics, bridge, profile +@@ -128,7 +128,7 @@ def _sanitize_nics(nics, bridge, profile counter = counter + 1 intf = nics[iname] -- if (intf["interface_type"] in ("master","bond","bridge","bonded_bridge_slave") or -+ if ((intf.has_key("interface_type") and intf["interface_type"] in ("master","bond","bridge","bonded_bridge_slave")) or +- if (intf["interface_type"] in ("bond","bridge","bonded_bridge_slave") or ++ if ((intf.has_key("interface_type") and intf["interface_type"] in ("bond","bridge","bonded_bridge_slave")) or vlanpattern.match(iname) or iname.find(":") != -1): continue ++++++ looking_for_cobbler_order_changed.diff ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:09.000987502 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:09.000987502 +0100 @@ -2,7 +2,7 @@ =================================================================== --- koan/utils.py.orig +++ koan/utils.py -@@ -456,8 +456,8 @@ def connect_to_server(server=None,port=N +@@ -464,8 +464,8 @@ def connect_to_server(server=None,port=N connect_ok = 0 try_urls = [ ++++++ update-outdated-apache-config-bsc956264.patch ++++++ --- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:09.008987210 +0100 +++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:09.008987210 +0100 @@ -12,7 +12,7 @@ </Directory> ProxyRequests off -@@ -29,7 +28,6 @@ BrowserMatch "MSIE" AuthDigestEnableQuer +@@ -29,8 +28,7 @@ BrowserMatch "MSIE" AuthDigestEnableQuer <Directory "@@webroot@@/cobbler/web/"> Options Indexes FollowSymLinks @@ -21,6 +21,7 @@ + Require all granted </Directory> + <IfVersion >= 2.4> Index: config/cobbler_web.conf =================================================================== --- config/cobbler_web.conf.orig
