From 5ada64217e2bed80a5316c0eff7881f4e358b608 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Mon, 19 Apr 2021 11:41:11 -0400
Subject: [PATCH] dont get conflict rpm

---
 script/step/make_iso_everysrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/step/make_iso_everysrc.sh b/script/step/make_iso_everysrc.sh
index cc943c2..a6964ed 100644
--- a/script/step/make_iso_everysrc.sh
+++ b/script/step/make_iso_everysrc.sh
@@ -42,7 +42,7 @@ function make_iso_everysrc_inchroot()
     do
         sed -i '/<packagelist type="exclude">/a\        <packagereq>'$rpmsname'</packagereq>' config/rpmlist.xml
     done
-
+    sed -i '/parse_rpmlist_xml \"conflict\"/d' rpm.sh
     OBS_STANDARD_REPO_URL=${OBS_STANDARD_REPO_URL%/*}
     set +e
     num=0
-- 
Gitee