From 576543c90ce56ba2bf648ebe8d356d79de79883c Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Wed, 16 Mar 2005 10:18:28 +0000
Subject: [PATCH] [project @ 2005-03-16 10:18:28 by simonmar] Be a bit less
 eager about creating the user database: now we only create
 it when explicitly asked to use it with --user.

---
 ghc/utils/ghc-pkg/Main.hs |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 5f9d4c3..42753db 100644
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -268,11 +268,7 @@ getPkgDatabases modify flags = do
 	subdir = targetARCH ++ '-':targetOS ++ '-':version
 	archdir   = appdir `joinFileName` subdir
 	user_conf = archdir `joinFileName` "package.conf"
-  b <- doesFileExist user_conf
-  when (not b) $ do
-	putStrLn ("Creating user package database in " ++ user_conf)
-	createDirectoryIfMissing True archdir
-	writeFile user_conf emptyPackageConfig
+  user_exists <- doesFileExist user_conf
 
   let
 	-- The semantics here are slightly strange.  If we are
@@ -281,8 +277,9 @@ getPkgDatabases modify flags = do
 	-- If we are not modifying (eg. list, describe etc.) then
 	-- the user database is included by default.
 	databases
-	  | modify    = foldl addDB [global_conf] flags
-	  | otherwise = foldl addDB [user_conf,global_conf] flags
+	  | modify          = foldl addDB [global_conf] flags
+	  | not user_exists = foldl addDB [global_conf] flags
+	  | otherwise       = foldl addDB [user_conf,global_conf] flags
 
 	-- implement the following rules:
 	-- 	--user means overlap with the user database
@@ -295,6 +292,11 @@ getPkgDatabases modify flags = do
 	addDB dbs (FlagConfig f) = f : dbs
 	addDB dbs _		 = dbs
 
+  when (not user_exists && user_conf `elem` databases) $ do
+	putStrLn ("Creating user package database in " ++ user_conf)
+	createDirectoryIfMissing True archdir
+	writeFile user_conf emptyPackageConfig
+
   db_stack <- mapM readParseDatabase databases
   return db_stack
 
-- 
1.7.10.4