summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-01-12 12:40:18 -0400
committerJoey Hess2016-01-12 12:40:18 -0400
commit4f88f8f1ec293445a526d163818c72b3a38f9ecf (patch)
treea4d19ec71c09372c99083f411a7458a3c88ff518
parent358321afad0445e66c0aaaea74c4e80caafb77b4 (diff)
parentf3d86f4583fdb7626119210503512a6f78b95f5e (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog5
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Git.hs2
-rw-r--r--src/Propellor/Git/Config.hs2
4 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e2aaa670..72145793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-propellor (2.15.3) UNRELEASED; urgency=medium
+propellor (2.15.3) unstable; urgency=medium
* Added Git.bareRepoDefaultBranch property
Thanks, Sean Whitton.
+ * Add missing Control.Applicative imports needed by older versions of ghc.
- -- Joey Hess <id@joeyh.name> Tue, 05 Jan 2016 13:30:21 -0400
+ -- Joey Hess <id@joeyh.name> Tue, 12 Jan 2016 12:37:22 -0400
propellor (2.15.2) unstable; urgency=medium
diff --git a/propellor.cabal b/propellor.cabal
index 42270819..56b64ce7 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.15.2
+Version: 2.15.3
Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>
diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs
index 5a16b3db..949f430b 100644
--- a/src/Propellor/Git.hs
+++ b/src/Propellor/Git.hs
@@ -4,6 +4,8 @@ import Utility.Process
import Utility.Exception
import System.Directory
+import Control.Applicative
+import Prelude
getCurrentBranch :: IO String
getCurrentBranch = takeWhile (/= '\n')
diff --git a/src/Propellor/Git/Config.hs b/src/Propellor/Git/Config.hs
index 97835231..f5b6678d 100644
--- a/src/Propellor/Git/Config.hs
+++ b/src/Propellor/Git/Config.hs
@@ -7,6 +7,8 @@ import Utility.SafeCommand
import Utility.Monad
import Control.Monad
+import Control.Applicative
+import Prelude
getGitConfigValue :: String -> IO (Maybe String)
getGitConfigValue key = do