Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2020-11-04 18:27:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler"
Wed Nov 4 18:27:41 2020 rev:59 rq:845906 version:3.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-09-29
19:05:54.894060586 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new.11331/cobbler.changes
2020-11-04 18:32:26.468141212 +0100
@@ -1,0 +2,7 @@
+Tue Nov 3 10:57:09 UTC 2020 - Jochen Breuer <jbre...@suse.de>
+
+- Fixes usage of str.join()
+- Added:
+ * fix-for-old-str.join-usage.diff
+
+-------------------------------------------------------------------
New:
----
fix-for-old-str.join-usage.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cobbler.spec ++++++
--- /var/tmp/diff_new_pack.1Juyt8/_old 2020-11-04 18:32:27.292139384 +0100
+++ /var/tmp/diff_new_pack.1Juyt8/_new 2020-11-04 18:32:27.296139376 +0100
@@ -134,6 +134,7 @@
Patch0: cgi_parse_qs_is_deprecated.diff
Patch1: refactored_auth_module.diff
Patch2: load_module_apache_suse_fix.diff
+Patch3: fix-for-old-str.join-usage.diff
BuildRequires: git-core
BuildRequires: %{system_release_pkg}
@@ -269,6 +270,7 @@
%if 0%{?suse_version}
%patch2 -p1
%endif
+%patch3 -p1
%if 0%{?suse_version}
# Set tftpboot location correctly for SUSE distributions
++++++ fix-for-old-str.join-usage.diff ++++++
>From 72e3bb2b07f300c7848a4e7da1e84f8952e80fb9 Mon Sep 17 00:00:00 2001
From: Jochen Breuer <jbre...@suse.de>
Date: Tue, 3 Nov 2020 10:51:35 +0100
Subject: [PATCH] Fix for old str.join usage
Fixes #2624
---
cobbler/tftpgen.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cobbler/tftpgen.py b/cobbler/tftpgen.py
index 5c5b1efb..c054eded 100644
--- a/cobbler/tftpgen.py
+++ b/cobbler/tftpgen.py
@@ -975,7 +975,7 @@ class TFTPGen(object):
# out the path based on where the kernel is stored. We do this because
some distros base future downloads on the
# initial URL passed in, so all of the files need to be at this
location (which is why we can't use the images
# link, which just contains the kernel and initrd).
- distro_mirror_name = str.join(distro.kernel.split('/')[-2:-1], '')
+ distro_mirror_name = ''.join(distro.kernel.split('/')[-2:-1])
blended = utils.blender(self.api, False, obj)
@@ -1068,7 +1068,7 @@ class TFTPGen(object):
# out the path based on where the kernel is stored. We do this because
some distros base future downloads on the
# initial URL passed in, so all of the files need to be at this
location (which is why we can't use the images
# link, which just contains the kernel and initrd).
- distro_mirror_name = str.join('', distro.kernel.split('/')[-2:-1])
+ distro_mirror_name = ''.join(distro.kernel.split('/')[-2:-1])
blended = utils.blender(self.api, False, obj)
--
2.28.0
