From afe156f8c870d773edbc4ae87c14d493749be835 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Wed, 12 May 2021 03:42:51 +0000
Subject: [PATCH] bugfix I3qY98

(cherry picked from commit a8002d805c0fe9d02e9508d7d9031d22a703f7d4)
---
 0002-bugfix-I3QY98.patch | 44 ++++++++++++++++++++++++++++++++++++++++
 oemaker.spec             | 12 ++++++++---
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 0002-bugfix-I3QY98.patch

diff --git a/0002-bugfix-I3QY98.patch b/0002-bugfix-I3QY98.patch
new file mode 100644
index 0000000..aa91672
--- /dev/null
+++ b/0002-bugfix-I3QY98.patch
@@ -0,0 +1,44 @@
+From 1907bdefd7fc8c4e1ef2db78d3e38dc3d6b6a32c Mon Sep 17 00:00:00 2001
+From: miao_kaibo <miaokaibo@outlook.com>
+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 b802103..e1b3524 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
@@ -22,7 +22,8 @@ Source3:        rpmlist.xml
 Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
 Requires:       lorax >= 19.6.78-1
 
-Patch0001:      0001-rename-source-iso.patch
+Patch0001:	0001-rename-source-iso.patch
+Patch0002:	0002-bugfix-I3QY98.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -120,7 +121,12 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
-* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-4
+* Wed May 12 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-5
+- ID:NA
+- SUG:NA
+- DESC: add qemu-block-iscsi in virtualization-hypervisor group
+
+* TUE May 11 2021 imxcc <xingchaochao@huawei.com> - 2.0.0-4
 - ID:NA
 - SUG:NA
 - DESC: change for issue I3DJJW
-- 
Gitee