diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 19:03:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 19:03:29 -0400 |
| commit | 0ad5b6e4109f69ed74a8410f62782aa128e6446a (patch) | |
| tree | 4ff3e4d7dba490dd0c5a1fca289bef7340d01d18 | |
| parent | 95f89280dda74b6c7df166f8c584cf337f5b3f96 (diff) | |
| parent | db1cf96dd70c3f7396b6a3bb89f26b972cc54e0c (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | debian/manpages | 1 | ||||
| -rw-r--r-- | propellor.1 (renamed from debian/propellor.1) | 0 | ||||
| -rw-r--r-- | propellor.cabal | 3 | ||||
| -rw-r--r-- | src/wrapper.hs | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 00000000..263e13a3 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +propellor.1 diff --git a/debian/propellor.1 b/propellor.1 index 3ee3bf4a..3ee3bf4a 100644 --- a/debian/propellor.1 +++ b/propellor.1 diff --git a/propellor.cabal b/propellor.cabal index c492fb66..9f33dd81 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -18,13 +18,14 @@ Extra-Source-Files: config-simple.hs config-joey.hs config.hs + propellor.1 debian/changelog debian/README.Debian - debian/propellor.1 debian/compat debian/control debian/copyright debian/rules + debian/manpages Synopsis: property-based host configuration management in haskell Description: Propellor enures that the system it's run in satisfies a list of diff --git a/src/wrapper.hs b/src/wrapper.hs index 75830e72..106591fc 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -71,6 +71,8 @@ wrapper args propellordir propellorbin = do ( do void $ boolSystem "git" [Param "clone", File distrepo, File propellordir] fetchUpstreamBranch propellordir distrepo + changeWorkingDirectory propellordir + void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"] , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] ) |