diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-04-20 04:20:32 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-04-20 04:20:32 +0000 |
| commit | 6c3c0155c9675fd8a4283457a653d297fc944755 (patch) | |
| tree | d5efb009319785aaac27dd3d2867191054e03ecf /0002-bugfix-I3QY98.patch | |
| parent | 6c545b27d3238c5d54b8581de4d9d26b9fe8b1fe (diff) | |
automatic import of oemakeropeneuler20.03
Diffstat (limited to '0002-bugfix-I3QY98.patch')
| -rw-r--r-- | 0002-bugfix-I3QY98.patch | 44 |
1 files changed, 44 insertions, 0 deletions
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 + |