summaryrefslogtreecommitdiff
path: root/src/Propellor/Git
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 18:40:24 -0400
committerJoey Hess2016-03-07 20:17:18 -0400
commit0daf924b43d0750b285a5e857eb9946a9a71e6cc (patch)
treea5ac2c8aa1464daa7c2649772242d466485935e2 /src/Propellor/Git
parentad4323859caea503114df40bde0f6b273441e6d2 (diff)
privdata/relocate
better than symlinks because this way no conflict can ever occur and, commit from hook
Diffstat (limited to 'src/Propellor/Git')
-rw-r--r--src/Propellor/Git/VerifiedBranch.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Git/VerifiedBranch.hs b/src/Propellor/Git/VerifiedBranch.hs
index a39bc7e9..51fcb573 100644
--- a/src/Propellor/Git/VerifiedBranch.hs
+++ b/src/Propellor/Git/VerifiedBranch.hs
@@ -2,7 +2,6 @@ module Propellor.Git.VerifiedBranch where
import Propellor.Base
import Propellor.Git
-import Propellor.Gpg
import Propellor.PrivData.Paths
import Utility.FileMode
@@ -14,6 +13,7 @@ import Utility.FileMode
verifyOriginBranch :: String -> IO Bool
verifyOriginBranch originbranch = do
let gpgconf = privDataDir </> "gpg.conf"
+ keyring <- privDataKeyring
writeFile gpgconf $ unlines
[ " keyring " ++ keyring
, "no-auto-check-trustdb"
@@ -38,6 +38,7 @@ fetchOrigin = do
oldsha <- getCurrentGitSha1 branchref
+ keyring <- privDataKeyring
whenM (doesFileExist keyring) $
ifM (verifyOriginBranch originbranch)
( do