propellor 4.7.4 → 4.7.5

raw patch · 4 files changed

+20/−4 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG +6/−0
• debian/changelog +6/−0
• propellor.cabal +1/−1
• src/Propellor/Gpg.hs +7/−3

@@ -1,3 +1,9 @@+propellor (4.7.5) unstable; urgency=medium++  * Avoid crashing when getTerminalName fails due to eg, being in a chroot.++ -- Joey Hess <id@joeyh.name>  Tue, 01 Aug 2017 15:28:58 -0400+ propellor (4.7.4) unstable; urgency=medium    * Set GPG_TTY when run at a terminal, so that gpg can do password

@@ -1,3 +1,9 @@+propellor (4.7.5) unstable; urgency=medium++  * Avoid crashing when getTerminalName fails due to eg, being in a chroot.++ -- Joey Hess <id@joeyh.name>  Tue, 01 Aug 2017 15:28:58 -0400+ propellor (4.7.4) unstable; urgency=medium    * Set GPG_TTY when run at a terminal, so that gpg can do password

@@ -1,5 +1,5 @@ Name: propellor-Version: 4.7.4+Version: 4.7.5 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess <id@joeyh.name>

@@ -20,6 +20,7 @@ import Utility.Env import Utility.Directory import Utility.Split+import Utility.Exception  -- | When at a tty, set GPG_TTY to point to the tty device. This is needed -- so that when gpg is run with stio connected to a pipe, it is still able@@ -35,9 +36,12 @@ 		isterm <- queryTerminal h 		if isterm 			then do-				ttyname <- getTerminalName h-				-- do not overwrite-				setEnv "GPG_TTY" ttyname False+				v <- tryNonAsync $ getTerminalName h+				case v of+					Right ttyname -> +						-- do not overwrite+						setEnv "GPG_TTY" ttyname False+					Left _ -> checkhandles hs 			else checkhandles hs  type KeyId = String