rpm/0001-bugfix-rpm-4.14.2-fix-tty-failed.patch
2020-01-12 15:25:02 +08:00

26 lines
936 B
Diff

From 733a0997ba5608f6b37d0b6d47c7bbd6f9d62381 Mon Sep 17 00:00:00 2001
From: openeuler-basic <shenyangyang4@huawei.com>
Date: Fri, 10 Jan 2020 10:29:16 +0800
Subject: [PATCH] bugfix rpm 4.14.2 fix tty failed
---
rpmpopt.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rpmpopt.in b/rpmpopt.in
index 8e4ef02..9585422 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -219,7 +219,7 @@ rpmbuild alias --buildpolicy --define '__os_install_post %{_rpmconfigdir}/brp-!#
--POPTargs=$"<policy>"
# Minimally preserve rpmbuild's --sign functionality
rpmbuild alias --sign \
- --pipe 'rpm --addsign `grep ".*: .*\.rpm$"|cut -d: -f2` < "/dev/"`ps -p $$ -o tty | tail -n 1`' \
+ --pipe "grep '.*: .*\.rpm$'|cut -d: -f2|xargs -r rpm --addsign" \
--POPTdesc=$"generate GPG signature (deprecated, use command rpmsign instead)"
rpmbuild alias --trace --eval '%trace' \
--POPTdesc=$"trace macro expansion"
--
1.8.3.1