Merge branch 'joeyconfig'

2014-08-19 19:03:29 -04:00 · 2014-08-19 19:03:29 -04:00 · 0ad5b6e410
parent 95f89280dd db1cf96dd7
commit 0ad5b6e410
4 changed files with 5 additions and 1 deletions
--- a/debian/manpages
+++ b/debian/manpages
@ -0,0 +1 @@
+propellor.1
--- a/debian/propellor.1
+++ b/debian/propellor.1
--- 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
--- 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]
 			)