From 0ad0b1ce5a39b13fd02b83dd493a3cf6650ffaf8 Mon Sep 17 00:00:00 2001 From: randen Date: Sun, 28 Aug 2016 15:36:11 -0700 Subject: [PATCH] Get minimal/full packages using bcIncludeExtra [The HP installers 8.0.1-a for Windows already included this fix.] * hptool/src/Package.hs * Package.hs was using allPackages sometimes with True and other times with False rather than always being from bcIncludeExtra, which was causing the "full" flavor on Windows to not get all the packages. --- hptool/src/Package.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hptool/src/Package.hs b/hptool/src/Package.hs index 0272fd0..e6cf796 100644 --- a/hptool/src/Package.hs +++ b/hptool/src/Package.hs @@ -47,7 +47,8 @@ packageRules = do packageDepsFile PackageWildCard %> \depFile -> do hpRel <- askHpRelease - installAction depFile hpRel + bc <- askBuildConfig + installAction depFile (bcIncludeExtra bc) hpRel listBuild %> \out -> do hpRel <- askHpRelease @@ -64,8 +65,8 @@ packageRules = do -- components come out closer to normal sort order. Go figure! -installAction :: FilePath -> Release -> Action () -installAction depFile hpRel = do +installAction :: FilePath -> Bool -> Release -> Action () +installAction depFile incExtras hpRel = do let pkg = extractPackage depFile let srcDir = packageSourceDir pkg need [ dir srcDir ] @@ -89,7 +90,7 @@ installAction depFile hpRel = do constraints = map (\p -> pkgName p ++ "==" ++ showVersion (pkgVersion p)) $ - (allPackages True) hpRel + (allPackages incExtras) hpRel decode out = case drop 1 $ lines out of ("All the requested packages are already installed:":_) -> @@ -105,4 +106,4 @@ installAction depFile hpRel = do ++ unwords (filter (not . (`elem` packages)) deps) ++ "\n" ++ "Could not build " ++ depFile _ -> Left out - packages = map show $ (allPackages True) hpRel --note should be False if minimal... + packages = map show $ (allPackages incExtras) hpRel