summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--propellor.cabal3
-rw-r--r--src/Propellor/CmdLine.hs3
-rw-r--r--src/Propellor/Types/CmdLine.hs1
4 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 58e32205..87bbe3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (3.0.3) UNRELEASED; urgency=medium
+
+ * Remove Propellor.DotDir from the propellor library, as its use of
+ Paths_propellor prevents use of the module out of propellor's tree.
+ This module is only needed for the wrapper program anyway, which
+ handles --init.
+
+ -- Joey Hess <id@joeyh.name> Sun, 01 May 2016 17:49:10 -0400
+
propellor (3.0.2) unstable; urgency=medium
* Added Apt.periodicUpdates.
diff --git a/propellor.cabal b/propellor.cabal
index 78a14c5e..0bc8fc21 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -47,6 +47,8 @@ Executable propellor
MissingH, directory, filepath, IfElse, process, bytestring, hslogger,
unix, unix-compat, ansi-terminal, containers (>= 0.5), network, async,
time, mtl, transformers, exceptions (>= 0.6), stm, text
+ Other-Modules:
+ Propellor.DotDir
Executable propellor-config
Main-Is: config.hs
@@ -152,7 +154,6 @@ Library
Propellor.Info
Propellor.Message
Propellor.Debug
- Propellor.DotDir
Propellor.PrivData
Propellor.Engine
Propellor.EnsureProperty
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)