cab 0.1.1 → 0.1.2

raw patch · 5 files changed

+22/−6 lines, 5 filesdep +unix

Dependencies added: unix

Files

Commands.hs +3/−4
Env.hs +10/−0
Main.hs +2/−0
Program.hs +1/−1
cab.cabal +6/−1

Commands.hs view

@@ -38,12 +38,11 @@ installed _ _ opts = do     let optall = OptAll `elem` opts         optrec = OptRecursive `elem` opts-    flt <- if optall then allPkgs else userPkgs     db' <- getPkgDB (getSandbox opts)+    flt <- if optall then allPkgs else userPkgs+    -- FIXME: the optall case does unnecessary conversion     let pkgs = toPkgList flt db'-    db <- if optall-          then return db'-          else toPkgDB . flip toPkgList db' <$> userPkgs+        db = toPkgDB pkgs     forM_ pkgs $ \pkg -> do         putStrLn . fullNameOfPkgInfo $ pkg         when optrec $ printDeps True db 1 pkg

+ Env.hs view

@@ -0,0 +1,10 @@+{-# LANGUAGE CPP #-}++module Env (unsetEnv) where++#if defined(mingw32_HOST_OS) || defined(__MINGW32__)+unsetEnv :: String -> IO ()+unsetEnv _ = return ()+#else+import System.Posix.Env (unsetEnv)+#endif

Main.hs view

@@ -10,6 +10,7 @@ import System.Console.GetOpt import System.Environment import System.Exit+import Env import Types import Utils @@ -17,6 +18,7 @@  main :: IO () main = flip catches handlers $ do+    unsetEnv "GHC_PACKAGE_PATH"     oargs <- getArgs     let pargs = parseArgs getOptDB oargs     checkOptions1 pargs illegalOptionsAndExit

Program.hs view

@@ -1,7 +1,7 @@ module Program where  version :: String-version = "0.1.1"+version = "0.1.2"  programName :: String programName = "cab"

cab.cabal view

@@ -1,5 +1,5 @@ Name:                   cab-Version:                0.1.1+Version:                0.1.2 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -26,8 +26,13 @@                         containers, Cabal,                         attoparsec, attoparsec-enumerator,                         enumerator, bytestring+  if os(windows)+     Build-Depends:+  else+     Build-Depends:     unix   Other-Modules:	CmdDB                         Commands+                        Env                         PkgDB                         Process                         Program