update info of script
(cherry picked from commit 3c82e20299020ff30b690944985674238987c1bf)
This commit is contained in:
parent
b1d3318b82
commit
f9aaef568a
27
0002-fix-install-and-start-script-info.patch
Normal file
27
0002-fix-install-and-start-script-info.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff --git a/packageship/pkgshipd b/packageship/pkgshipd
|
||||
index 9cb3dc694e39f188a1e8775b37087c16059317b9..e1e843019d459ecde4aeaa6c18feb1e9d2d4fda1 100644
|
||||
--- a/packageship/pkgshipd
|
||||
+++ b/packageship/pkgshipd
|
||||
@@ -357,7 +357,7 @@ try:
|
||||
response = redis.Redis(host='$redis_ip',
|
||||
port="$redis_port")
|
||||
print(response.ping())
|
||||
-except redis.ConnectionError:
|
||||
+except Exception:
|
||||
print(False)"
|
||||
python3_version=$(python3 --version)
|
||||
if [[ "${python3_version}" =~ "command not found" ]]; then
|
||||
|
||||
diff --git a/packageship/auto_install_pkgship_requires.sh b/packageship/auto_install_pkgship_requires.sh
|
||||
index 4a914034170cd11e3996c34814806e8448862a32..5ecce235dae835050960046fa28a148b7326f1c4 100644
|
||||
--- a/packageship/auto_install_pkgship_requires.sh
|
||||
+++ b/packageship/auto_install_pkgship_requires.sh
|
||||
@@ -128,7 +128,7 @@ function main() {
|
||||
elif [ "${INSTALL_SOFTWARE}" = "redis" ]; then
|
||||
download_install_redis
|
||||
else
|
||||
- echo "Failed to parse parameters, please use 'bash auto_install_es.sh elasticsearch/redis' "
|
||||
+ echo "Failed to parse parameters, please use '/bin/bash auto_install_pkgship_requires.sh elasticsearch/redis' "
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
10
pkgship.spec
10
pkgship.spec
@ -1,11 +1,12 @@
|
||||
Name: pkgship
|
||||
Version: 2.2.0
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so on.
|
||||
License: Mulan 2.0
|
||||
URL: https://gitee.com/openeuler/pkgship
|
||||
Source0: https://gitee.com/openeuler/pkgship-%{version}.tar.gz
|
||||
patch0001: 0001-bugfix-pkginfo.patch
|
||||
Patch0001: 0001-bugfix-pkginfo.patch
|
||||
Patch0002: 0002-fix-install-and-start-script-info.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -111,6 +112,11 @@ create_dir_file /var/log/pkgship-operation 700 d
|
||||
%attr(0640,pkgshipuser,pkgshipuser) /lib/systemd/system/pkgship.service
|
||||
|
||||
%changelog
|
||||
* Thu Sep 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 2.2.0-3
|
||||
- When the input parameters of the script that executes the installation of es and redis are incorrect,
|
||||
- the prompt message is incorrect.
|
||||
- When the redis port setting is unreasonable, the prompt message for starting the service is incorrect.
|
||||
|
||||
* Wed Aug 25 2021 Pengju Jiang <jiangpengju2@huawei.com> - 2.2.0-2
|
||||
- when the command line is parsing a single package of json data, there will be none in the
|
||||
- required_by_bin and required_by_bin lists in the json data, resulting in parsing errors,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user