From 42d49ae5694fab78017413984c2af8608324e83e Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Wed, 24 Jul 2024 01:43:59 +0000 Subject: [PATCH] add timeout when create option.list --- generate-compatibility-deps | 8 ++++---- system-rpm-config.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/generate-compatibility-deps b/generate-compatibility-deps index b8721ec..2a1b866 100755 --- a/generate-compatibility-deps +++ b/generate-compatibility-deps @@ -38,13 +38,13 @@ for dir in $sbindir $bindir ; do for f in $(ls $RPM_BUILD_ROOT/$dir) ; do full_name=$RPM_BUILD_ROOT/$dir/$f if file $full_name | grep executable > /dev/null 2>&1; then - if $full_name --help > /dev/null 2>&1; then + if timeout 5 $full_name --help > /dev/null 2>&1; then $full_name --help > $f-option.list - elif $full_name -help > /dev/null 2>&1; then + elif timeout 5 $full_name -help > /dev/null 2>&1; then $full_name -help > $f-option.list - elif $full_name help > /dev/null 2>&1; then + elif timeout 5 $full_name help > /dev/null 2>&1; then $full_name help > $f-option.list - elif $full_name -h > /dev/null 2>&1; then + elif timeout 5 $full_name -h > /dev/null 2>&1; then $full_name -h > $f-option.list fi fi diff --git a/system-rpm-config.spec b/system-rpm-config.spec index 9cab03f..48b2e68 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -1,4 +1,4 @@ -%define anolis_release 36 +%define anolis_release 37 Summary: Anolis OS specific rpm configuration files Name: system-rpm-config @@ -211,6 +211,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua %license MulanPSL %changelog +* Wed Jul 24 2024 Wenlong Zhang - 1:23-37 +- add timeout when create option.list + * Wed Jul 17 2024 Chunmei Xu - 1:23-36 - brp-mangle-shebangs: remove python2 related -- Gitee