cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-04-22 21:00:45 -04:00
parent d7b402cf6f f59527cca4
commit 9699945ad4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 propellor (2.3.0) unstable; urgency=medium
* Make propellor resistent to changes to shared libraries, such as libffi, * Make propellor resistent to changes to shared libraries, such as libffi,

6
src/Propellor/Property/Git.hs
View File

@ -103,15 +103,15 @@ bareRepo repo user gitshared = check (isRepo repo) $ propertyList ("git repo: "
dirExists repo : case gitshared of dirExists repo : case gitshared of
NotShared -> NotShared ->
[ ownerGroup repo user (userGroup user) [ ownerGroup repo user (userGroup user)
, userScriptProperty user ["git", "init", "--bare", "--shared=false", repo] , userScriptProperty user ["git init --bare --shared=false " ++ shellEscape repo]
] ]
SharedAll -> SharedAll ->
[ ownerGroup repo user (userGroup user) [ ownerGroup repo user (userGroup user)
, userScriptProperty user ["git", "init", "--bare", "--shared=all", repo] , userScriptProperty user ["git init --bare --shared=all " ++ shellEscape repo]
] ]
Shared group' -> Shared group' ->
[ ownerGroup repo user group' [ ownerGroup repo user group'
, userScriptProperty user ["git", "init", "--bare", "--shared=group", repo] , userScriptProperty user ["git init --bare --shared=group " ++ shellEscape repo]
] ]
where where
isRepo repo' = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", repo']) isRepo repo' = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", repo'])