diff --git a/obs-server.spec b/obs-server.spec index 5b74f7bc42c591ed0594851dd93a841f57bc25e5..dd4812190e88c8a2e7d7caf1456b11da145da368 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,7 +5,7 @@ Name: obs-server Version: 2.10.1 -Release: lp151.23.9 +Release: lp151.23.10 Summary: The Open Build Service -- Server Component License: GPL-2.0-only or GPL-3.0-only URL: http://www.openbuildservice.org @@ -17,6 +17,7 @@ Patch2: 0002-CVE-2020-8020.patch Patch3: 0003-CVE-2020-8021.patch Patch4: 0004-remove-systemV-method.patch Patch5: 0005-obsscheduler-stop.patch +Patch6: obs_project_update-should-tell-the-usage-but-not-hung-still.patch BuildArch: noarch BuildRequires: python-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Compress-Zlib, xz @@ -486,6 +487,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Thu 17 Jun 2021 sunguoshuai - 2.10.1-lp151.23.10 +- obs_project_update should tell the usage but not hung still. + * Thu Jun 17 2021 caodongxia - 2.10.1-lp151.23.9 - Fix obsworker and obsscheduler. diff --git a/obs_project_update-should-tell-the-usage-but-not-hung-still.patch b/obs_project_update-should-tell-the-usage-but-not-hung-still.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3716d0e7a55fec80290bf3a741d007b4c535da1 --- /dev/null +++ b/obs_project_update-should-tell-the-usage-but-not-hung-still.patch @@ -0,0 +1,27 @@ +From 29a123a92e31dbdc137e94428323c75d7a0c215b Mon Sep 17 00:00:00 2001 +From: si-gui +Date: Thu, 17 Jun 2021 16:34:05 +0800 +Subject: [PATCH] obs_project_update should tell the usage but not hung still + +--- + dist/obs_project_update | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dist/obs_project_update b/dist/obs_project_update +index 07c8233..1da43ce 100755 +--- a/dist/obs_project_update ++++ b/dist/obs_project_update +@@ -17,6 +17,10 @@ + # $ echo "kiwi deb" | obs_project_update -u https://api.opensuse.org OBS:Server:2.4 https://api.yourdomain.ext OBS:Server:2.4 + # + usage="usage: $0 {-e | -u} [listfile]" ++if [ $# -lt 5 ];then ++ echo $usage ++ exit 1 ++fi + + srcexpand='-e' + dstexpand='-u' +-- +2.30.0 +