refactoring and cleanup

No code changes.

1 files changed, 12 insertions, 0 deletions

diff --git a/Config.hs b/Config.hs
index f4c3843af..f994002b9 100644
--- a/Config.hs
+++ b/Config.hs
@@ -10,6 +10,7 @@ module Config where
 import Common.Annex
 import qualified Git
 import qualified Annex
+import Types.Key (readKey)
 
 type ConfigKey = String
 
@@ -92,3 +93,14 @@ getNumCopies v =
 			return $ read $ Git.configGet g config "1"
 		config = "annex.numcopies"
 
+{- The Key specified by the --key parameter. -}
+cmdlineKey :: Annex Key
+cmdlineKey  = do
+	k <- Annex.getState Annex.defaultkey
+	case k of
+		Nothing -> nokey
+		Just "" -> nokey
+		Just kstring -> maybe badkey return $ readKey kstring
+	where
+		nokey = error "please specify the key with --key"
+		badkey = error "bad key"