From c7a156a8c359d714da88892154ad034eeb597836 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 22 Apr 2015 20:59:14 -0400 Subject: ensureProperty takes a list of commands to run, but Git.bareRepo previously passed a list of arguments instead. Signed-Off-By: Jelmer Vernooij --- src/Propellor/Property/Git.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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']) -- cgit v1.3-2-g0d8e From f59527cca4f3496a561d8b25ee276103adb2fa97 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Apr 2015 21:00:41 -0400 Subject: changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) 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 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, -- cgit v1.3-2-g0d8e