hide error when isula info is abnormal

Signed-off-by: yangjiaqi <yangjiaqi16@huawei.com>
This commit is contained in:
yangjiaqi 2023-12-25 11:10:09 +08:00
parent 3ab5a6e73a
commit 7d8a41156d
7 changed files with 16 additions and 9 deletions

View File

@ -1,7 +1,7 @@
#Basic Information #Basic Information
Name: syscontainer-tools Name: syscontainer-tools
Version: 0.9 Version: 0.9
Release: 61 Release: 62
Summary: syscontainer tools for IT, work with iSulad Summary: syscontainer tools for IT, work with iSulad
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/syscontainer-tools URL: https://gitee.com/openeuler/syscontainer-tools
@ -13,14 +13,15 @@ Patch2: 0002-syscontainer-tools-build-security-option.patch
Patch3: 0003-enable-external-linkmode-for-cgo-build.patch Patch3: 0003-enable-external-linkmode-for-cgo-build.patch
Patch4: 0004-add-dt-test.patch Patch4: 0004-add-dt-test.patch
Patch5: 0005-add-riscv64-to-syscall-build.patch Patch5: 0005-add-riscv64-to-syscall-build.patch
Patch6: 0006-support-ipv6.patch
Patch7: 0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
Patch8: 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
Patch9: 0009-drop-useless-function-error-and-info.patch
Patch10: 0010-fix-log-of-removeUdevRule.patch
%ifarch sw_64 %ifarch sw_64
Patch6: 0006-syscontainer-tools-Add-sw64-architecture.patch Patch1000: 1000-add-sw_64-support-not-upstream-modified-files.patch
%endif %endif
Patch7: 0007-support-ipv6.patch
Patch8: 0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
Patch9: 0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch
Patch10: 0010-drop-useless-function-error-and-info.patch
Patch11: 0011-fix-log-of-removeUdevRule.patch
#Dependency #Dependency
BuildRequires: glibc-static BuildRequires: glibc-static
@ -60,8 +61,8 @@ make localtest
%preun %preun
%post %post
GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"` GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
if [ "$GRAPH" == "" ]; then if [ x"$GRAPH" == "x" ]; then
GRAPH="/var/lib/isulad" GRAPH="/var/lib/isulad"
fi fi
@ -122,6 +123,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
rm -rfv %{buildroot} rm -rfv %{buildroot}
%changelog %changelog
* Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-62
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:hide error when isula info is abnormal
* Thu Sep 21 2023 yangjiaqi<yangjiaqi16@huawei.com> - 0.9-61 * Thu Sep 21 2023 yangjiaqi<yangjiaqi16@huawei.com> - 0.9-61
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA