diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-31 00:56:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-31 00:56:04 -0400 |
| commit | 0fa21aaa036f11b679d5d81a7ba04e6766e630a8 (patch) | |
| tree | dc0b6dd14f73218ce2dfa451a650d005ca6c6ff5 | |
| parent | b074bd5114908bceda8555be161a9ed8cb85aef7 (diff) | |
spin --via: Avoid committing on relay host.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | src/Propellor/CmdLine.hs | 2 |
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 |