/usr/bin/pinentry should not check if stderr is opened (#787775)

This commit is contained in:
Rex Dieter 2014-07-19 14:20:55 -05:00
parent 168f7f3fba
commit 338d9cc00f
2 changed files with 5 additions and 5 deletions

View File

@ -59,10 +59,6 @@ then
elif [ -x /usr/bin/pinentry-qt ] elif [ -x /usr/bin/pinentry-qt ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-qt" export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# pinentry-curses is installed by default, test if we're in a terminal
elif [ -t 2 ]
then
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
else else
#test if gui binary is required #test if gui binary is required
for opt in "$@"; do for opt in "$@"; do
@ -72,6 +68,7 @@ else
exit 1 exit 1
fi fi
done done
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
fi fi
fi fi

View File

@ -1,7 +1,7 @@
Name: pinentry Name: pinentry
Version: 0.8.3 Version: 0.8.3
Release: 3%{?dist} Release: 4%{?dist}
Summary: Collection of simple PIN or passphrase entry dialogs Summary: Collection of simple PIN or passphrase entry dialogs
# qt & qt4 subpackage have different license, see subpackage definitions # qt & qt4 subpackage have different license, see subpackage definitions
@ -129,6 +129,9 @@ fi
%changelog %changelog
* Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> 0.8.3-4
- /usr/bin/pinentry should not check if stderr is opened (#787775)
* Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.3-3 * Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.3-3
- .spec cleanup (drop support for old releases) - .spec cleanup (drop support for old releases)
- -gtk: Provides: pinentry-gtk2 - -gtk: Provides: pinentry-gtk2