[pkg-haskell-tools] 01/03: dht make-all: Rename option to --bindmount

Joachim Breitner nomeata at moszumanska.debian.org
Wed Aug 19 13:56:58 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 0363d5809f46a22a30dc51c8a3b7dbef91091fdb
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Aug 19 15:41:33 2015 +0200

    dht make-all: Rename option to --bindmount
---
 src/make-all.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index 7a2c410..532bbe0 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -37,7 +37,7 @@ data Conf = Conf
     { distribution :: String
     , excludedPackages :: [String]
     , targetDir :: FilePath
-    , baseTmpDir :: FilePath
+    , bindMountDir :: FilePath
     , jobs :: Int
     , schrootName :: String
     , shakeVerbosity' :: Verbosity
@@ -71,9 +71,9 @@ confSpec = Conf
     value "lab"
     )
  <*> strOption (
-    long "tmpdir" <>
+    long "bindmount" <>
     metavar "DIR" <>
-    help "temporary directory (assumed to be bind-mounted in the schroot)" <>
+    help "directory bind-mounted in the schroot" <>
     showDefault <>
     value "/tmp"
     )
@@ -402,7 +402,7 @@ shakeMain conf@(Conf {..}) = do
             liftIO (listFiles targetDir)
         let localDepPkgs = map debFileNameToPackage localDebs
 
-        withTempDir baseTmpDir $ \tmpdir -> do
+        withTempDir bindMountDir $ \tmpdir -> do
             -- Now monkey-patch dependencies out of the package lists
             let fixup = tmpdir </> "fixup.sh"
             liftIO $ writeFile fixup  $ fixupScript localDepPkgs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git



More information about the Pkg-haskell-commits mailing list