From b1f747a5b1e3bbfc75c74ade1cbbcdcc3061e311 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Thu, 9 Oct 2025 14:19:35 +0800 Subject: [PATCH] compatible with single-line no-newline configuration --- ...single-line-no-newline-configuration.patch | 34 +++++++++++++++++++ oemaker.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 backport-Compatible-with-single-line-no-newline-configuration.patch diff --git a/backport-Compatible-with-single-line-no-newline-configuration.patch b/backport-Compatible-with-single-line-no-newline-configuration.patch new file mode 100644 index 0000000..6c83ec1 --- /dev/null +++ b/backport-Compatible-with-single-line-no-newline-configuration.patch @@ -0,0 +1,34 @@ +From e84f874825bc59ed32a610b1fff2cdc770702e4e Mon Sep 17 00:00:00 2001 +From: yixiangzhike +Date: Fri, 26 Sep 2025 11:11:39 +0800 +Subject: [PATCH] Compatible with single-line no-newline configuration + +--- + isocut/isocut.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/isocut/isocut.py b/isocut/isocut.py +index a8cb596..7a3039f 100644 +--- a/isocut/isocut.py ++++ b/isocut/isocut.py +@@ -384,7 +384,7 @@ def select_rpm(): + rpm_list = "" + for line in rpm_list_file: + if not (line is None or line.strip() == ""): +- rpm_list += " %s" % line[:-1].strip() ++ rpm_list += " %s" % line.strip() + cmd = "yumdownloader -y --resolve -c {0} --installroot {1} --destdir {2}/{3} {4}".format( + ICONFIG.yum_conf, ICONFIG.cache_path, ICONFIG.temp_path_new_image, + EXCLUDE_DIR_PACKAGES, rpm_list) +@@ -436,7 +436,7 @@ def regen_repodata(): + if line is None or line.strip() == "": + continue + pack = ET.SubElement(packlist, 'packagereq', type='default') +- pack.text = line[:-1].strip() ++ pack.text = line.strip() + if os.uname()[-1].strip() == 'x86_64': + pack.text = pack.text.split(".x86_64")[0] + elif os.uname()[-1].strip() == 'aarch64': +-- +2.43.0 + diff --git a/oemaker.spec b/oemaker.spec index 08bc8a3..1d64497 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -15,7 +15,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 3.3.0 -Release: 18 +Release: 19 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -46,6 +46,7 @@ Patch0001: 0001-bugfix-IABY7K.patch Patch0002: 0001-fix-livecd-grub2-efi.cfg-not-found.patch Patch0003: 0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch Patch0004: 0002-delete-package-xorg-x11-server-utils.patch +Patch0005: backport-Compatible-with-single-line-no-newline-configuration.patch %description a building tool for DVD ISO making and ISO cutting @@ -235,6 +236,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Thu Oct 9 2025 yixiangzhike - 3.3.0-19 +- ID:NA +- SUG:NA +- DESC: compatible with single-line no-newline configuration + * Wed Sep 24 2025 Li Ping <1477412247@qq.com> - 3.3.0-18 - ID:NA - SUG:NA -- Gitee