summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2015-03-22 10:05:03 -0400
committerJoey Hess2015-03-22 10:05:03 -0400
commitfe7b1233f4fef3d9717eaa30e7781b3bdb21c058 (patch)
tree31398337ac0b1f65618087966126d4a156573a28 /src/wrapper.hs
parent93fe81bae9a632f19c6d64ecad9c7567821214dd (diff)
parentb32d05a661ff2b928bf9472abe8a39743ccea1e7 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 034eb2bf..a73ed969 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -77,7 +77,7 @@ wrapper args propellordir propellorbin = do
, void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
)
- checkRepo = whenM (doesFileExist disthead) $ do
+ checkRepo = whenM (doesFileExist disthead <&&> doesFileExist (propellordir </> "propellor.cabal")) $ do
headrev <- takeWhile (/= '\n') <$> readFile disthead
changeWorkingDirectory propellordir
headknown <- catchMaybeIO $