diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-23 18:49:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-23 18:49:33 -0400 |
| commit | f14749c1ccdaeb76beee74381d86f0bc4bc76b09 (patch) | |
| tree | 5cff1489e97022ad227de288e470acfe0128df5c /src/Propellor/CmdLine.hs | |
| parent | 1695f5c678e5e64bc12252ee5b8ed75d1c5b5c49 (diff) | |
| parent | 9d975e9ee4c44782da0815fb161ea8676dbf559c (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 4a0ac613..3e375c7e 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -29,6 +29,7 @@ usage h = hPutStrLn h $ unlines , " propellor --dump field context" , " propellor --edit field context" , " propellor --list-fields" + , " propellor --merge" ] usageError :: [String] -> IO a @@ -49,6 +50,7 @@ processCmdLine = go =<< getArgs go ("--dump":f:c:[]) = withprivfield f c Dump go ("--edit":f:c:[]) = withprivfield f c Edit go ("--list-fields":[]) = return ListFields + go ("--merge":[]) = return Merge go ("--help":_) = do usage stdout exitFailure @@ -98,6 +100,7 @@ defaultMain hostlist = do go _ (GitPush fin fout) = gitPushHelper fin fout go _ (Update Nothing) = forceConsole >> fetchFirst (onlyprocess (update Nothing)) go _ (Update (Just h)) = forceConsole >> fetchFirst (update (Just h)) + go _ Merge = mergeSpin go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline go True cmdline = updateFirst cmdline $ go False cmdline go False (Spin hs r) = do |