Try to get the right package DB stuff in place.

Suggested by Duncan.
bos · Jul 5, 2011 · 00dfa09 · 00dfa09
1 parent 01a930b
commit 00dfa09
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Setup.hs b/Setup.hs
@@ -99,16 +99,15 @@ register' pkg@PackageDescription { library       = Just lib  }
      _ | modeGenerateRegFile   -> die "Generate Reg File not supported"
        | modeGenerateRegScript -> die "Generate Reg Script not supported"
        | otherwise             -> registerPackage verbosity
---                                    installedPkgInfo pkg lbi inplace packageDb
-                                    installedPkgInfo pkg lbi inplace (withPackageDB lbi)
+                                    installedPkgInfo pkg lbi inplace
+                                    (withPackageDB lbi)
 
   where
     modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
     modeGenerateRegScript = fromFlag (regGenScript regFlags)
     inplace   = fromFlag (regInPlace regFlags)
-    packageDb = case flagToList (regPackageDB regFlags) of
-                    [] -> [registrationPackageDB (withPackageDB lbi)]
-                    xs -> xs
+    packageDb = nub $ withPackageDB lbi ++
+                      maybeToList (flagToMaybe  (regPackageDB regFlags))
     distPref  = fromFlag (regDistPref regFlags)
     verbosity = fromFlag (regVerbosity regFlags)