From 3b02b2cbb41400cdffa4d79c9e73e5443f66535e Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Mon, 12 Dec 2022 11:33:02 +0800
Subject: [PATCH] fix sed error and exclude multi-verison unable install rpm

---
 script/step/get_epol_rpms.sh                   | 14 ++++++++++++--
 script/tools/package_install_problem_report.py |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/script/step/get_epol_rpms.sh b/script/step/get_epol_rpms.sh
index 1d24305..088b50f 100644
--- a/script/step/get_epol_rpms.sh
+++ b/script/step/get_epol_rpms.sh
@@ -142,7 +142,7 @@ function get_epol_rpms_inchroot()
     unrpms=`cat ${UNABLE_INSTALL_LIST}`
     for unrpm in ${unrpms}
     do
-	    sed -i "/${unrpm}\./d" ava_epol_lst
+	    sed -i "/^${unrpm}\./d" ava_epol_lst
     done
     yumdownloader --installroot="${tmp_dir}/Packages" --destdir="${tmp_dir}/Packages" $(cat ava_epol_lst | tr '\n' ' ')
     rm -rf ${tmp_dir}/Packages/var
@@ -158,7 +158,7 @@ function get_epol_rpms_inchroot()
         unrpms=`cat ${UNABLE_INSTALL_SOURCE_LIST}`
         for unrpm in ${unrpms}
         do
-		sed -i "/${unrpm}\./d" ava_epol_lst
+		sed -i "/^${unrpm}\./d" ava_epol_lst
         done
         yumdownloader --installroot="${tmp_source}/Packages" --destdir="${tmp_source}/Packages" --source $(cat ava_epol_lst | tr '\n' ' ')
         rm -rf ${tmp_source}/Packages/var
@@ -184,6 +184,11 @@ function get_epol_rpms_inchroot()
             yum-config-manager --add-repo ${repo_url}
             yum clean all
             yum list --installroot="${tmp_dir}/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v "\.src" > ava_epol_lst
+            unrpms=`cat ${UNABLE_INSTALL_LIST}_${VER}`
+            for unrpm in ${unrpms}
+            do
+                sed -i "/^${unrpm}\./d" ava_epol_lst
+            done
             yumdownloader --installroot="${tmp_dir}/Packages" --destdir="${tmp_dir}/Packages" $(cat ava_epol_lst | tr '\n' ' ')
             rm -rf ${tmp_dir}/Packages/var
             createrepo -d ${tmp_dir}
@@ -195,6 +200,11 @@ function get_epol_rpms_inchroot()
                 mkdir -p ${tmp_source}/Packages
                 yum-config-manager --add-repo "http://${OBS_SERVER_IP}:82/${SUB_EPOL_MULTI_REPO_URL}/standard_x86_64"
                 yum list --installroot="${tmp_source}/Packages" --available | awk '{print $1}' | grep "\.src" > ava_epol_lst
+                unrpms=`cat ${UNABLE_INSTALL_SOURCE_LIST}_${VER}`
+                for unrpm in ${unrpms}
+                do
+                    sed -i "/^${unrpm}\./d" ava_epol_lst
+                done
                 yumdownloader --installroot="${tmp_source}/Packages" --destdir="${tmp_source}/Packages" --source $(cat ava_epol_lst | tr '\n' ' ')
                 rm -rf ${tmp_source}/Packages/var
                 createrepo -d ${tmp_source}
diff --git a/script/tools/package_install_problem_report.py b/script/tools/package_install_problem_report.py
index 88c3ad1..b53969d 100644
--- a/script/tools/package_install_problem_report.py
+++ b/script/tools/package_install_problem_report.py
@@ -141,6 +141,8 @@ def get_subjob_url(lastbuildnumber):
         if "#" in tmp:
             t = tmp.replace(" #", "/").split()[2]
             job_url = baseurl + "/" + t + "/consoleFull"
+            if "Train" in t or "Wallaby" in t:
+                continue
             short_job_url.append(t)
             job_url_list.append(job_url)
     return job_url_list, short_job_url
-- 
Gitee