[PATCH compass-ci 2/2] sparrow: fix that 0-package/os/openEuler can only be executed once
[Error Msg] ++ rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm warning: lib64lockfile1-1.16-1-omv4002.aarch64.rpm: Header V4 RSA/SHA256 Signature, key ID bf81de15: NOKEY package lib64lockfile1-1.16-1.aarch64 is already installed file /usr/lib64/liblockfile.so.1.0 from install of lib64lockfile1-1.16-1.aarch64 conflicts with file from package lib64lockfile1-1.16-1.aarch64 package lockfile-progs-0.1.18-5.aarch64 is already installed file /usr/bin/lockfile-check from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-create from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-remove from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-touch from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-lock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-touchlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-unlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 Signed-off-by: Yu Chuan <13186087857@163.com> --- sparrow/0-package/os/openEuler | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 43e96ab8ab2e..5b32c0a23784 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,17 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +install_rpm() +{ + local pkg=$1 + local pkg_url=$2 + + rpm -qa | grep -q "$pkg" && return 0 + + wget $pkg_url + rpm -i $(basename $pkg_url) && rm -rf $(basename $pkg_url) +} + pkgs=( vim git @@ -24,8 +35,10 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... -wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... +install_rpm \ + "lib64lockfile1-1.16-1.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..." -rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm -rm -rf *.rpm +install_rpm \ + "lockfile-progs-0.1.18-5.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..." -- 2.23.0
On Tue, Dec 15, 2020 at 10:40:13AM +0800, Yu Chuan wrote: why executed 0-package/os/openEuler twice? install once is ok. Thanks, Yinsi
[Error Msg] ++ rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm warning: lib64lockfile1-1.16-1-omv4002.aarch64.rpm: Header V4 RSA/SHA256 Signature, key ID bf81de15: NOKEY package lib64lockfile1-1.16-1.aarch64 is already installed file /usr/lib64/liblockfile.so.1.0 from install of lib64lockfile1-1.16-1.aarch64 conflicts with file from package lib64lockfile1-1.16-1.aarch64 package lockfile-progs-0.1.18-5.aarch64 is already installed file /usr/bin/lockfile-check from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-create from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-remove from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-touch from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-lock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-touchlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-unlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64
Signed-off-by: Yu Chuan <13186087857@163.com> --- sparrow/0-package/os/openEuler | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 43e96ab8ab2e..5b32c0a23784 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,17 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+install_rpm() +{ + local pkg=$1 + local pkg_url=$2 + + rpm -qa | grep -q "$pkg" && return 0 + + wget $pkg_url + rpm -i $(basename $pkg_url) && rm -rf $(basename $pkg_url) +} + pkgs=( vim git @@ -24,8 +35,10 @@ pkgs=(
yum install -y --skip-broken "${pkgs[@]}"
-wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... -wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... +install_rpm \ + "lib64lockfile1-1.16-1.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..."
-rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm -rm -rf *.rpm +install_rpm \ + "lockfile-progs-0.1.18-5.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..." -- 2.23.0
On Tue, Dec 15, 2020 at 10:40:13AM +0800, Yu Chuan wrote: use --force will not have error. Thanks, Yinsi
[Error Msg] ++ rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm warning: lib64lockfile1-1.16-1-omv4002.aarch64.rpm: Header V4 RSA/SHA256 Signature, key ID bf81de15: NOKEY package lib64lockfile1-1.16-1.aarch64 is already installed file /usr/lib64/liblockfile.so.1.0 from install of lib64lockfile1-1.16-1.aarch64 conflicts with file from package lib64lockfile1-1.16-1.aarch64 package lockfile-progs-0.1.18-5.aarch64 is already installed file /usr/bin/lockfile-check from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-create from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-remove from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-touch from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-lock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-touchlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-unlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64
Signed-off-by: Yu Chuan <13186087857@163.com> --- sparrow/0-package/os/openEuler | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 43e96ab8ab2e..5b32c0a23784 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,17 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+install_rpm() +{ + local pkg=$1 + local pkg_url=$2 + + rpm -qa | grep -q "$pkg" && return 0 + + wget $pkg_url + rpm -i $(basename $pkg_url) && rm -rf $(basename $pkg_url) +} + pkgs=( vim git @@ -24,8 +35,10 @@ pkgs=(
yum install -y --skip-broken "${pkgs[@]}"
-wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... -wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... +install_rpm \ + "lib64lockfile1-1.16-1.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..."
-rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm -rm -rf *.rpm +install_rpm \ + "lockfile-progs-0.1.18-5.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..." -- 2.23.0
On Tue, Dec 15, 2020 at 11:48:43AM +0800, Liu Yinsi wrote:
On Tue, Dec 15, 2020 at 10:40:13AM +0800, Yu Chuan wrote:
use --force will not have error.
Good ! I'll find a suitable param to let the change as small as it can. -------- Thanks Yu Chuan
Thanks, Yinsi
[Error Msg] ++ rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm warning: lib64lockfile1-1.16-1-omv4002.aarch64.rpm: Header V4 RSA/SHA256 Signature, key ID bf81de15: NOKEY package lib64lockfile1-1.16-1.aarch64 is already installed file /usr/lib64/liblockfile.so.1.0 from install of lib64lockfile1-1.16-1.aarch64 conflicts with file from package lib64lockfile1-1.16-1.aarch64 package lockfile-progs-0.1.18-5.aarch64 is already installed file /usr/bin/lockfile-check from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-create from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-remove from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/lockfile-touch from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-lock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-touchlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64 file /usr/bin/mail-unlock from install of lockfile-progs-0.1.18-5.aarch64 conflicts with file from package lockfile-progs-0.1.18-5.aarch64
Signed-off-by: Yu Chuan <13186087857@163.com> --- sparrow/0-package/os/openEuler | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 43e96ab8ab2e..5b32c0a23784 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,17 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+install_rpm() +{ + local pkg=$1 + local pkg_url=$2 + + rpm -qa | grep -q "$pkg" && return 0 + + wget $pkg_url + rpm -i $(basename $pkg_url) && rm -rf $(basename $pkg_url) +} + pkgs=( vim git @@ -24,8 +35,10 @@ pkgs=(
yum install -y --skip-broken "${pkgs[@]}"
-wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... -wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release... +install_rpm \ + "lib64lockfile1-1.16-1.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..."
-rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm -rm -rf *.rpm +install_rpm \ + "lockfile-progs-0.1.18-5.$(arch)"\ + "http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/release..." -- 2.23.0
participants (2)
-
Liu Yinsi -
Yu Chuan