diff --git a/0002-bugfix-I3QY98.patch b/0002-bugfix-I3QY98.patch new file mode 100644 index 0000000000000000000000000000000000000000..aa91672e715ddf3bebf667d9d01bba400e695a27 --- /dev/null +++ b/0002-bugfix-I3QY98.patch @@ -0,0 +1,44 @@ +From 1907bdefd7fc8c4e1ef2db78d3e38dc3d6b6a32c Mon Sep 17 00:00:00 2001 +From: miao_kaibo +Date: Wed, 12 May 2021 03:34:44 +0000 +Subject: [PATCH] bugfix I3QY98 + +--- + isomaker/rpm.sh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh +index e5fad1f..e3feaab 100755 +--- a/isomaker/rpm.sh ++++ b/isomaker/rpm.sh +@@ -165,8 +165,11 @@ function get_everything_rpms() + if [ -s parsed_rpmlist_conflict ];then + for rpmname in $(cat parsed_rpmlist_conflict) + do +- sed -i "/^${rpmname}\./d" ava_every_lst +- echo "${rpmname}" >> conflict_list ++ cat ava_every_lst | grep "^${rpmname}\." ++ if [ $? -eq 0 ];then ++ sed -i "/^${rpmname}\./d" ava_every_lst ++ echo "${rpmname}" >> conflict_list ++ fi + done + fi + parse_rpmlist_xml "everything_conflict" +@@ -174,8 +177,11 @@ function get_everything_rpms() + if [ -s parsed_rpmlist_everything_conflict ];then + for rpmname in $(cat parsed_rpmlist_everything_conflict) + do +- sed -i "/^${rpmname}\./d" ava_every_lst +- echo "${rpmname}" >> conflict_list ++ cat ava_every_lst | grep "^${rpmname}\." ++ if [ $? -eq 0 ];then ++ sed -i "/^${rpmname}\./d" ava_every_lst ++ echo "${rpmname}" >> conflict_list ++ fi + done + fi + } +-- +1.8.3.1 + diff --git a/oemaker.spec b/oemaker.spec index b80210306d657a3e35a6782163393c25f6cd2819..72710162d111844aba8888ad49af914fb03ec1c8 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.0 -Release: 4 +Release: 5 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -23,6 +23,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 Patch0001: 0001-rename-source-iso.patch +Patch0002: 0002-bugfix-I3QY98.patch %description a building tool for DVD ISO making and ISO cutting @@ -120,6 +121,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Apr 12 2021 miao_kaibo - 2.0.0-5 +- ID:NA +- SUG:NA +- DESC: bugfix I3QY98 + * Wed Apr 7 2021 miao_kaibo - 2.0.0-4 - ID:NA - SUG:NA