Commit c205aebd authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari

Removed colon append operation (fixes #10785)

Reviewers: jgertm, austin, thomie

Reviewed By: thomie

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1164

GHC Trac Issues: #10785
parent 262954c2
localT1750.package.conf:
localT1750.package.conf
{T1750A-1}
{T1750B-1}
local01.package.conf:
local01.package.conf
(no packages)
Reading package info from "test.pkg" ... done.
name: testpkg
......@@ -55,7 +55,7 @@ pkgroot:
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
Reading package info from "test2.pkg" ... done.
local01.package.conf:
local01.package.conf
testpkg-1.2.3.4
(testpkg-2.0)
......@@ -170,6 +170,6 @@ hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
local01.package.conf:
local01.package.conf
(no packages)
Reading package info from "test3.pkg" ... done.
local05a.package.conf:
local05a.package.conf
(testpkg-2.0)
local05b.package.conf:
local05b.package.conf
(testpkg-3.0)
databases 1 and 2:
localshadow1.package.conf:
localshadow1.package.conf
(shadow-1)
(shadowdep-1)
localshadow2.package.conf:
localshadow2.package.conf
(shadow-1)
databases 1 and 3:
localshadow1.package.conf:
localshadow1.package.conf
(shadow-1)
(shadowdep-1)
localshadow3.package.conf:
localshadow3.package.conf
(shadow-1)
should FAIL:
......
pdb.safePkg01/local.db:
pdb.safePkg01/local.db
safePkg01-1.0
trusted: False
......@@ -29,17 +29,17 @@ trusted: safe
require own pkg trusted: True
M_SafePkg6
package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg7
package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
trusted: safe
require own pkg trusted: False
M_SafePkg8
package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
trusted: trustworthy
require own pkg trusted: False
......
......@@ -1241,7 +1241,7 @@ listPackages verbosity my_flags mPackageName mModuleName = do
broken = map installedComponentId (brokenPackages pkg_map)
show_normal PackageDB{ location = db_name, packages = pkg_confs } =
do hPutStrLn stdout (db_name ++ ":")
do hPutStrLn stdout db_name
if null pkg_confs
then hPutStrLn stdout " (no packages)"
else hPutStrLn stdout $ unlines (map (" " ++) (map pp_pkg pkg_confs))
......@@ -1273,8 +1273,8 @@ listPackages verbosity my_flags mPackageName mModuleName = do
then termText (location db) <#> termText "\n (no packages)\n"
else
mconcat $ map (<#> termText "\n") $
(termText (location db) :
map (termText " " <#>) (map pp_pkg pkg_confs))
(termText (location db)
: map (termText " " <#>) (map pp_pkg pkg_confs))
where
pp_pkg p
| installedComponentId p `elem` broken = withF Red doc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment