From 7d8a41156d9efba37aec0edd6be462a7ea8dfd7d Mon Sep 17 00:00:00 2001
From: yangjiaqi <yangjiaqi16@huawei.com>
Date: Mon, 25 Dec 2023 11:10:09 +0800
Subject: [PATCH] hide error when isula info is abnormal

Signed-off-by: yangjiaqi <yangjiaqi16@huawei.com>
---
 ...port-ipv6.patch => 0006-support-ipv6.patch |  0
 ...o-avoid-remounting-the-sharepath-mas.patch |  0
 ...container-tools-netns-containerid-di.patch |  0
 ...drop-useless-function-error-and-info.patch |  0
 ...ch => 0010-fix-log-of-removeUdevRule.patch |  0
 ...-support-not-upstream-modified-files.patch |  0
 syscontainer-tools.spec                       | 25 ++++++++++++-------
 7 files changed, 16 insertions(+), 9 deletions(-)
 rename 0007-support-ipv6.patch => 0006-support-ipv6.patch (100%)
 rename 0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch => 0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch (100%)
 rename 0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch => 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch (100%)
 rename 0010-drop-useless-function-error-and-info.patch => 0009-drop-useless-function-error-and-info.patch (100%)
 rename 0011-fix-log-of-removeUdevRule.patch => 0010-fix-log-of-removeUdevRule.patch (100%)
 rename 0006-syscontainer-tools-Add-sw64-architecture.patch => 1000-add-sw_64-support-not-upstream-modified-files.patch (100%)

diff --git a/0007-support-ipv6.patch b/0006-support-ipv6.patch
similarity index 100%
rename from 0007-support-ipv6.patch
rename to 0006-support-ipv6.patch
diff --git a/0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch b/0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
similarity index 100%
rename from 0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
rename to 0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
diff --git a/0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch b/0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
similarity index 100%
rename from 0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch
rename to 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
diff --git a/0010-drop-useless-function-error-and-info.patch b/0009-drop-useless-function-error-and-info.patch
similarity index 100%
rename from 0010-drop-useless-function-error-and-info.patch
rename to 0009-drop-useless-function-error-and-info.patch
diff --git a/0011-fix-log-of-removeUdevRule.patch b/0010-fix-log-of-removeUdevRule.patch
similarity index 100%
rename from 0011-fix-log-of-removeUdevRule.patch
rename to 0010-fix-log-of-removeUdevRule.patch
diff --git a/0006-syscontainer-tools-Add-sw64-architecture.patch b/1000-add-sw_64-support-not-upstream-modified-files.patch
similarity index 100%
rename from 0006-syscontainer-tools-Add-sw64-architecture.patch
rename to 1000-add-sw_64-support-not-upstream-modified-files.patch
diff --git a/syscontainer-tools.spec b/syscontainer-tools.spec
index 498b6c2..d1c4c2d 100644
--- a/syscontainer-tools.spec
+++ b/syscontainer-tools.spec
@@ -1,7 +1,7 @@
 #Basic Information
 Name:           syscontainer-tools
 Version:        0.9
-Release:        61
+Release:        62
 Summary:        syscontainer tools for IT, work with iSulad
 License:        Mulan PSL v2
 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
 Patch4:      0004-add-dt-test.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
-Patch6:      0006-syscontainer-tools-Add-sw64-architecture.patch
+Patch1000:   1000-add-sw_64-support-not-upstream-modified-files.patch
 %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
 BuildRequires: glibc-static 
@@ -60,8 +61,8 @@ make localtest
 %preun
 
 %post
-GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
-if [ "$GRAPH" == "" ]; then
+GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
+if [ x"$GRAPH" == "x" ]; then
     GRAPH="/var/lib/isulad"
 fi
 
@@ -122,6 +123,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
 rm -rfv %{buildroot}
 
 %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
 - Type:bugfix
 - CVE:NA