From 6b80356f6de05efef1f14fd2af9835cf5abe69a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Nov 2010 13:40:00 -0400 Subject: fixes --- CmdLine.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'CmdLine.hs') diff --git a/CmdLine.hs b/CmdLine.hs index e03c4d4c6..7aaa1c842 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -10,7 +10,6 @@ module CmdLine (parseCmd) where import System.Console.GetOpt import Control.Monad.State (liftIO) import System.Directory -import Data.String.Utils import Control.Monad (filterM) import Monad (when) @@ -19,7 +18,6 @@ import qualified Annex import Locations import qualified Backend import Types -import Core import Command import qualified Command.Add @@ -91,7 +89,7 @@ options = [ storestring n s = Annex.flagChange n $ FlagString s header :: String -header = "Usage: git-annex " ++ (join "|" $ map subcmdname subCmds) +header = "Usage: git-annex subcommand [option ..]" {- Usage message with lists of options and subcommands. -} usage :: String @@ -142,7 +140,7 @@ withKeys a params = return $ map a params withTempFile :: SubCmdSeekStrings withTempFile a params = return $ map a params withNothing :: SubCmdSeekNothing -withNothing a params = return [a] +withNothing a _ = return [a] {- filter out files from the state directory -} notState :: FilePath -> Bool -- cgit v1.2.3