propellor 2.15.2 → 2.15.3

raw patch · 6 files changed

+32/−1 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

+ Propellor.Property.Git: bareRepoDefaultBranch :: FilePath -> String -> Property NoInfo

Files

CHANGELOG +8/−0
debian/changelog +8/−0
propellor.cabal +1/−1
src/Propellor/Git.hs +2/−0
src/Propellor/Git/Config.hs +2/−0
src/Propellor/Property/Git.hs +11/−0

CHANGELOG view

@@ -1,3 +1,11 @@+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, 12 Jan 2016 12:37:22 -0400+ propellor (2.15.2) unstable; urgency=medium    * Added GNUPGBIN environment variable or git.program git config

debian/changelog view

@@ -1,3 +1,11 @@+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, 12 Jan 2016 12:37:22 -0400+ propellor (2.15.2) unstable; urgency=medium    * Added GNUPGBIN environment variable or git.program git config

propellor.cabal view

@@ -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>

src/Propellor/Git.hs view

@@ -4,6 +4,8 @@ import Utility.Exception  import System.Directory+import Control.Applicative+import Prelude  getCurrentBranch :: IO String getCurrentBranch = takeWhile (/= '\n')

src/Propellor/Git/Config.hs view

@@ -7,6 +7,8 @@ import Utility.Monad  import Control.Monad+import Control.Applicative+import Prelude  getGitConfigValue :: String -> IO (Maybe String) getGitConfigValue key = do

src/Propellor/Property/Git.hs view

@@ -149,3 +149,14 @@ 	refuses = repoConfigured repo ("receive.denyNonFastForwards", "true") 		`describe` desc "rejects" 	desc s = "git repo " ++ repo ++ " " ++ s ++ " non-fast-forward pushes"++-- | Sets a bare repository's default branch, which will be checked out+-- when cloning it.+bareRepoDefaultBranch :: FilePath -> String -> Property NoInfo+bareRepoDefaultBranch repo branch =+	userScriptProperty (User "root")+		[ "cd " ++ repo+		, "git symbolic-ref HEAD refs/heads/" ++ branch+		]+	`changesFileContent` (repo </> "HEAD")+	`describe` ("git repo at " ++ repo ++ " has default branch " ++ branch)