Small whitespace change

[ganeti-local] / Ganeti / HTools / CLI.hs

diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs
index 8f177da..6de77ee 100644 (file)
--- a/Ganeti/HTools/CLI.hs
+++ b/Ganeti/HTools/CLI.hs
@@ -28,21 +28,31 @@ import qualified Ganeti.HTools.Version as Version(version)
 import qualified Ganeti.HTools.Rapi as Rapi
 import qualified Ganeti.HTools.Text as Text
 import qualified Ganeti.HTools.Loader as Loader
+import qualified Ganeti.HTools.Instance as Instance
+import qualified Ganeti.HTools.Node as Node
 
 import Ganeti.HTools.Types
 
--- | Class for types which support show help and show version
+-- | Class for types which support show help and show version.
 class CLIOptions a where
+    -- | Denotes whether the show help option has been passed.
     showHelp    :: a -> Bool
+    -- | Denotes whether the show version option has been passed.
     showVersion :: a -> Bool
 
--- | Class for types which support the -i/-n/-m options
+-- | Class for types which support the -i\/-n\/-m options.
 class EToolOptions a where
+    -- | Returns the node file name.
     nodeFile   :: a -> FilePath
+    -- | Tells whether the node file has been passed as an option.
     nodeSet    :: a -> Bool
+    -- | Returns the instance file name.
     instFile   :: a -> FilePath
+    -- | Tells whether the instance file has been passed as an option.
     instSet    :: a -> Bool
+    -- | Rapi target, if one has been passed.
     masterName :: a -> String
+    -- | Whether to be less verbose.
     silent     :: a -> Bool
 
 -- | Command line parser, using the 'options' structure.
@@ -73,15 +83,16 @@ parseOpts argv progname options defaultOptions =
       where header = printf "%s %s\nUsage: %s [OPTION...]"
                      progname Version.version progname
 
--- | Parse the environment and return the node/instance names.
--- This also hardcodes here the default node/instance file names.
+-- | Parse the environment and return the node\/instance names.
+--
+-- This also hardcodes here the default node\/instance file names.
 parseEnv :: () -> IO (String, String)
 parseEnv () = do
   a <- getEnvDefault "HTOOLS_NODES" "nodes"
   b <- getEnvDefault "HTOOLS_INSTANCES" "instances"
   return (a, b)
 
--- | A shell script template for autogenerated scripts
+-- | A shell script template for autogenerated scripts.
 shTemplate :: String
 shTemplate =
     printf "#!/bin/sh\n\n\
@@ -95,10 +106,10 @@ shTemplate =
            \  fi\n\
            \}\n\n"
 
--- | External tool data loader from a variety of sources
+-- | External tool data loader from a variety of sources.
 loadExternalData :: (EToolOptions a) =>
                     a
-                 -> IO (NodeList, InstanceList, String, NameList, NameList)
+                 -> IO (Node.List, Instance.List, String)
 loadExternalData opts = do
   (env_node, env_inst) <- parseEnv ()
   let nodef = if nodeSet opts then nodeFile opts
@@ -111,7 +122,7 @@ loadExternalData opts = do
         host -> Rapi.loadData host
 
   let ldresult = input_data >>= Loader.mergeData
-  (loaded_nl, il, csf, ktn, kti) <-
+  (loaded_nl, il, csf) <-
       (case ldresult of
          Ok x -> return x
          Bad s -> do
@@ -124,4 +135,4 @@ loadExternalData opts = do
          putStrLn "Warning: cluster has inconsistent data:"
          putStrLn . unlines . map (\s -> printf "  - %s" s) $ fix_msgs
 
-  return (fixed_nl, il, csf, ktn, kti)
+  return (fixed_nl, il, csf)