!21 [sync] PR-20: avoild Ctrl+C print error stack
From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333
This commit is contained in:
commit
0d5ca40a7b
25
Avoild-print-error-stack.patch
Normal file
25
Avoild-print-error-stack.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From b4632c05d8c0a51460fb84ea70820f5136105fff Mon Sep 17 00:00:00 2001
|
||||
From: Mingzhe Zou <zoumingzhe@qq.com>
|
||||
Date: Mon, 27 Mar 2023 16:42:43 +0800
|
||||
Subject: [PATCH] targetcli: avoild Ctrl+C print error stack
|
||||
|
||||
---
|
||||
scripts/targetcli | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/targetcli b/scripts/targetcli
|
||||
index f00bffc..89a8188 100755
|
||||
--- a/scripts/targetcli
|
||||
+++ b/scripts/targetcli
|
||||
@@ -326,4 +326,7 @@ def main():
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
- main()
|
||||
+ try:
|
||||
+ main()
|
||||
+ except KeyboardInterrupt:
|
||||
+ pass
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -2,10 +2,11 @@ Name: targetcli
|
||||
License: ASL 2.0
|
||||
Summary: Generic SCSI target CLI shell
|
||||
Version: 2.1.54
|
||||
Release: 2
|
||||
Release: 3
|
||||
URL: https://github.com/open-iscsi/targetcli-fb
|
||||
Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz
|
||||
Patch01: Fix-changing-savedir-directory-mode.patch
|
||||
Patch02: Avoild-print-error-stack.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3-devel python3-setuptools systemd
|
||||
Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject-base
|
||||
@ -48,6 +49,9 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/
|
||||
%{_mandir}/man8/targetcli*.8*
|
||||
|
||||
%changelog
|
||||
* Mon Apr 8 2024 yanshuai <yanshuai@kylinos.cn> - 2.1.54-3
|
||||
- avoild Ctrl+C print error stack
|
||||
|
||||
* Sun Apr 7 2024 yanshuai <yanshuai@kylinos.cn> - 2.1.54-2
|
||||
- Fix changing savedir directory mode
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user