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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 19:03:29 -04:00
parent 95f89280dd db1cf96dd7
commit 0ad5b6e410
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/manpages vendored Normal file
View File

@ -0,0 +1 @@
propellor.1

0
debian/propellor.1 → propellor.1
View File

3
propellor.cabal
View File

@ -18,13 +18,14 @@ Extra-Source-Files:
config-simple.hs config-simple.hs
config-joey.hs config-joey.hs
config.hs config.hs
propellor.1
debian/changelog debian/changelog
debian/README.Debian debian/README.Debian
debian/propellor.1
debian/compat debian/compat
debian/control debian/control
debian/copyright debian/copyright
debian/rules debian/rules
debian/manpages
Synopsis: property-based host configuration management in haskell Synopsis: property-based host configuration management in haskell
Description: Description:
Propellor enures that the system it's run in satisfies a list of Propellor enures that the system it's run in satisfies a list of

2
src/wrapper.hs
View File

@ -71,6 +71,8 @@ wrapper args propellordir propellorbin = do
( do ( do
void $ boolSystem "git" [Param "clone", File distrepo, File propellordir] void $ boolSystem "git" [Param "clone", File distrepo, File propellordir]
fetchUpstreamBranch propellordir distrepo fetchUpstreamBranch propellordir distrepo
changeWorkingDirectory propellordir
void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"]
, void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
) )