summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--src/Propellor/CmdLine.hs2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d04ea16f..fdf37fdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ propellor (2.15.2) UNRELEASED; urgency=medium
Allows eg, GNUPGBIN=gpg2
Thanks, FĂ©lix Sipma.
* Bootstrap apt-get installs run with deconf noninteractive frontend.
+ * spin --via: Avoid committing on relay host.
-- Joey Hess <id@joeyh.name> Wed, 30 Dec 2015 15:01:19 -0400
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 4a4f71fe..1e61adc8 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -118,7 +118,7 @@ defaultMain hostlist = withConcurrentOutput $ do
go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline
go True cmdline = updateFirst cmdline $ go False cmdline
go False (Spin hs mrelay) = do
- commitSpin
+ unless (isJust mrelay) commitSpin
forM_ hs $ \hn -> withhost hn $ spin mrelay hn
go False cmdline@(SimpleRun hn) = do
forceConsole