path: root/src/Propellor/CmdLine.hs
diff options
authorJoey Hess2016-05-01 17:51:34 -0400
committerJoey Hess2016-05-01 17:51:34 -0400
commit6f958a6acb90779dcbc3e96acbddcfc62b3f3b48 (patch)
tree7c57e40e6366ac27726c2a83d9f6dd6467c6599e /src/Propellor/CmdLine.hs
parentce5b62a5bbba51dbf18087646e271ccf06dc55e1 (diff)
Remove Propellor.DotDir from the propellor library, as its use of Paths_propellor prevents use of the module out of propellor's tree.
Failure looked like: /home/lukas/.propellor/.cabal-sandbox/lib/x86_64-linux-ghc-7.10.3/propellor-3.0. 1-0JokOieT9kY9W7enKSzFHh/libHSpropellor-3.0.1-0JokOieT9kY9W7enKSzFHh.a(DotDir.o) :(.text+0x591): undefined reference to `propezu0JokOieT9kY9W7enKSzzFHh_Pathszupropellor_getLibDir_closure' This module is only needed for the wrapper program anyway, which handles --init. This does mean that ./propellor --init in propellor's tree will fail even though the help shows --init as an option.
Diffstat (limited to 'src/Propellor/CmdLine.hs')
1 files changed, 0 insertions, 3 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 19e49f5a..fc256109 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -16,7 +16,6 @@ import Propellor.Git.VerifiedBranch
import Propellor.Bootstrap
import Propellor.Spin
import Propellor.Types.CmdLine
-import Propellor.DotDir (interactiveInit)
import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.Chroot as Chroot
import qualified Propellor.Shim as Shim
@@ -71,7 +70,6 @@ processCmdLine = go =<< getArgs
go ("--serialized":s:[]) = serialized Serialized s
go ("--continue":s:[]) = serialized Continue s
go ("--gitpush":fin:fout:_) = return $ GitPush ( fin) ( fout)
- go ("--init":_) = return Init
go ("--run":h:[]) = go [h]
go (h:[])
| "--" `isPrefixOf` h = usageError [h]
@@ -133,7 +131,6 @@ defaultMain hostlist = withConcurrentOutput $ do
fetchFirst (buildFirst (findHost hostlist hn) cr cmdline (runhost hn))
-- When continuing after a rebuild, don't want to rebuild again.
go _ (Continue cmdline) = go NoRebuild cmdline
- go _ Init = interactiveInit
withhost :: HostName -> (Host -> IO ()) -> IO ()
withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn)