Patch for a patch: option for sandbox work on Linux.

kazu-yamamoto · Jan 15, 2014 · ca12b44 · ca12b44
1 parent d89bbba
commit ca12b44
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Distribution/Cab/Commands.hs b/Distribution/Cab/Commands.hs
@@ -105,16 +105,17 @@ uninstall nmver opts _ = do
 purge :: Bool -> [Option] -> (String,String) -> IO ()
 purge doit opts (name,ver) = do
     putStrLn $ "Deleting " ++ name ++ " " ++ ver
-    sandboxOpts <- getSandboxOpts2 <$> getSandbox
+    sandboxOpts <- (makeOptList . getSandboxOpts2) <$> getSandbox
     libdirs <- queryGhcPkg sandboxOpts "library-dirs"
     haddoc  <- cutTrailing "html" `fmap` queryGhcPkg sandboxOpts "haddock-html"
     unregister doit opts (name,ver)
     putStrLn $ unwords ["Removing dirs:", libdirs, haddoc]
     when doit . void . system . unwords $ ["rm -rf ", libdirs, haddoc]
-
   where
+    makeOptList "" = []
+    makeOptList x  = [x]
     queryGhcPkg sandboxOpts field = do
-        let options = ["field", sandboxOpts, name ++ "-" ++ ver, field]
+        let options = ["field"] ++ sandboxOpts ++ [name ++ "-" ++ ver, field]
         unwords . tail . words <$> readProcess "ghc-pkg" options ""
     cutTrailing suffix s
       | suffix `isSuffixOf` s = reverse . drop (length suffix) . reverse $ s