diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-22 21:00:45 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-22 21:00:45 -0400 |
| commit | 9699945ad4bb2b0064c19b10b5a7135a9ec7e9bc (patch) | |
| tree | 33cb3e991a36e6b3a0d856d322532a245db75a7c | |
| parent | d7b402cf6ffdcdbd7eccae4a766aed37198582e9 (diff) | |
| parent | f59527cca4f3496a561d8b25ee276103adb2fa97 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/Propellor/Property/Git.hs | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 80c03652..806ada57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (2.3.1) UNRELEASED; urgency=medium + + * Git.bareRepo: Fix bug in calls to userScriptProperty. + Thanks, Jelmer Vernooij. + + -- Joey Hess <id@joeyh.name> Wed, 22 Apr 2015 20:59:59 -0400 + propellor (2.3.0) unstable; urgency=medium * Make propellor resistent to changes to shared libraries, such as libffi, diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs index 0ac8eb84..0fc22616 100644 --- a/src/Propellor/Property/Git.hs +++ b/src/Propellor/Property/Git.hs @@ -103,15 +103,15 @@ bareRepo repo user gitshared = check (isRepo repo) $ propertyList ("git repo: " dirExists repo : case gitshared of NotShared -> [ ownerGroup repo user (userGroup user) - , userScriptProperty user ["git", "init", "--bare", "--shared=false", repo] + , userScriptProperty user ["git init --bare --shared=false " ++ shellEscape repo] ] SharedAll -> [ ownerGroup repo user (userGroup user) - , userScriptProperty user ["git", "init", "--bare", "--shared=all", repo] + , userScriptProperty user ["git init --bare --shared=all " ++ shellEscape repo] ] Shared group' -> [ ownerGroup repo user group' - , userScriptProperty user ["git", "init", "--bare", "--shared=group", repo] + , userScriptProperty user ["git init --bare --shared=group " ++ shellEscape repo] ] where isRepo repo' = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", repo']) |