Merge commit 'refs/namespaces/2d3c6f46d185bcac5a8bedd73102aa11cf797489/refs/heads/master' of cryptonomic.net:public_git/kiki

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 5f43b4f..07badb6 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -51,6 +51,7 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Char8 as S8
 import Data.ByteArray.Encoding
 import qualified Codec.Compression.GZip as GZip
+import GHC.Stack
 import qualified System.Posix.Types as Posix
 import System.Posix.Files (setFileCreationMask, setFileTimes )
 import System.Posix.Files ( setFdTimesHiRes )
@@ -547,7 +548,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outg
 
 
 
-unconditionally :: IO (KikiCondition a) -> IO a
+unconditionally :: HasCallStack => IO (KikiCondition a) -> IO a
 unconditionally action = do
     r <- action
     case r of
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index ddcaba0..02ac397 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -41,6 +41,7 @@ import qualified Data.ByteString.Char8      as S8
 import qualified Data.ByteString.Lazy       as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Data.Map.Strict            as Map
+import           GHC.Stack
 import           Network.Socket
 import qualified SSHKey                     as SSH
 
@@ -539,7 +540,7 @@ refreshCache rt rootdir = do
     rt'' <- rethrowKikiErrors rt'
     writePublicKeyFiles rt'' fw myId
 
-rethrowKikiErrors :: KikiCondition a -> IO a
+rethrowKikiErrors :: HasCallStack => KikiCondition a -> IO a
 rethrowKikiErrors BadPassphrase =
   error "Operation requires correct passphrase. (Hint: Use --passphrase-fd=0 to input it on stdin.)"
 rethrowKikiErrors rt = unconditionally $ return rt