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

6 files changed, 17 insertions, 17 deletions

diff --git a/testsuite/tests/cabal/T1750.stdout b/testsuite/tests/cabal/T1750.stdout
index 62d032334a..72d1cf6f79 100644
--- a/testsuite/tests/cabal/T1750.stdout
+++ b/testsuite/tests/cabal/T1750.stdout
@@ -1,4 +1,4 @@
-localT1750.package.conf:
+localT1750.package.conf
     {T1750A-1}
     {T1750B-1}
 
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index c056cf9824..d7b35b7f88 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -1,4 +1,4 @@
-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.
diff --git a/testsuite/tests/cabal/ghcpkg05.stdout b/testsuite/tests/cabal/ghcpkg05.stdout
index f89d332351..980139dd5a 100644
--- a/testsuite/tests/cabal/ghcpkg05.stdout
+++ b/testsuite/tests/cabal/ghcpkg05.stdout
@@ -1,6 +1,6 @@
-local05a.package.conf:
+local05a.package.conf
     (testpkg-2.0)
 
-local05b.package.conf:
+local05b.package.conf
     (testpkg-3.0)
 
diff --git a/testsuite/tests/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout
index bdd2459f73..a47ce15795 100644
--- a/testsuite/tests/cabal/shadow.stdout
+++ b/testsuite/tests/cabal/shadow.stdout
@@ -1,17 +1,17 @@
 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:
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 42e1778583..59886cd378 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -1,4 +1,4 @@
-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
 
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 2820f70591..b302810261 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -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