diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-08 23:55:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-08 23:55:31 -0400 |
| commit | 318aa76c845e48859dea15d27883ab81c204dee6 (patch) | |
| tree | 8dd266dbb5e55d0f5f2c5f8d66b3e823b30f1ba7 /src | |
| parent | bcc3c4daa3239538fb64a3895b35f337af149f84 (diff) | |
| parent | 67054800d4dccdb6634b723652257b3a6d1538cf (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 9 | ||||
| -rw-r--r-- | src/Propellor/Property/FreeBSD/Pkg.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/FreeBSD/Poudriere.hs | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 1761a11e..ee057d05 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -122,11 +122,10 @@ defaultMain hostlist = withConcurrentOutput $ do go cr cmdline@(Spin hs mrelay) = buildFirst cr cmdline $ do unless (isJust mrelay) commitSpin forM_ hs $ \hn -> withhost hn $ spin mrelay hn - go cr (Run hn) = fetchFirst $ - ifM ((==) 0 <$> getRealUserID) - ( runhost hn - , go cr (Spin [hn] Nothing) - ) + go cr cmdline@(Run hn) = ifM ((==) 0 <$> getRealUserID) + ( updateFirst cr cmdline $ runhost hn + , fetchFirst $ go cr (Spin [hn] Nothing) + ) go cr cmdline@(SimpleRun hn) = forceConsole >> fetchFirst (buildFirst cr cmdline (runhost hn)) -- When continuing after a rebuild, don't want to rebuild again. diff --git a/src/Propellor/Property/FreeBSD/Pkg.hs b/src/Propellor/Property/FreeBSD/Pkg.hs index 913710f7..6bbd2570 100644 --- a/src/Propellor/Property/FreeBSD/Pkg.hs +++ b/src/Propellor/Property/FreeBSD/Pkg.hs @@ -2,7 +2,7 @@ -- -- FreeBSD pkgng properties -{-# Language ScopedTypeVariables, GeneralizedNewtypeDeriving #-} +{-# Language ScopedTypeVariables, GeneralizedNewtypeDeriving, DeriveDataTypeable #-} module Propellor.Property.FreeBSD.Pkg where diff --git a/src/Propellor/Property/FreeBSD/Poudriere.hs b/src/Propellor/Property/FreeBSD/Poudriere.hs index 7ed7f59e..5467c668 100644 --- a/src/Propellor/Property/FreeBSD/Poudriere.hs +++ b/src/Propellor/Property/FreeBSD/Poudriere.hs @@ -2,7 +2,7 @@ -- -- FreeBSD Poudriere properties -{-# Language GeneralizedNewtypeDeriving #-} +{-# Language GeneralizedNewtypeDeriving, DeriveDataTypeable #-} module Propellor.Property.FreeBSD.Poudriere where |