diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-01 17:51:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-01 17:51:34 -0400 |
| commit | 6f958a6acb90779dcbc3e96acbddcfc62b3f3b48 (patch) | |
| tree | 7c57e40e6366ac27726c2a83d9f6dd6467c6599e /src | |
| parent | ce5b62a5bbba51dbf18087646e271ccf06dc55e1 (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')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 3 | ||||
| -rw-r--r-- | src/Propellor/Types/CmdLine.hs | 1 |
2 files changed, 0 insertions, 4 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 (Prelude.read fin) (Prelude.read 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) diff --git a/src/Propellor/Types/CmdLine.hs b/src/Propellor/Types/CmdLine.hs index 0773d9d9..558c6e8b 100644 --- a/src/Propellor/Types/CmdLine.hs +++ b/src/Propellor/Types/CmdLine.hs @@ -28,5 +28,4 @@ data CmdLine | ChrootChain HostName FilePath Bool Bool | GitPush Fd Fd | Check - | Init deriving (Read, Show, Eq) |