Commit b8937308 authored by panne's avatar panne
Browse files

[project @ 2005-03-05 13:48:42 by panne]

Warning police
parent 09d72f1d
......@@ -18,12 +18,11 @@ module Main (main) where
import Version ( version, targetOS, targetARCH )
import Distribution.InstalledPackageInfo
import Distribution.Compat.ReadP
import Distribution.ParseUtils ( showError, ParseResult(..) )
import Distribution.ParseUtils ( showError )
import Distribution.Package
import Distribution.Version
import Compat.Directory ( getAppUserDataDirectory, createDirectoryIfMissing )
import Compat.RawSystem ( rawSystem )
import Control.Exception ( evaluate )
import Prelude
......@@ -225,6 +224,7 @@ parseGlobPackageId =
return (PackageIdentifier{ pkgName = n, pkgVersion = globVersion }))
-- globVersion means "all versions"
globVersion :: Version
globVersion = Version{ versionBranch=[], versionTags=["*"] }
-- -----------------------------------------------------------------------------
......@@ -281,8 +281,8 @@ 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
| not modify = foldl addDB [user_conf,global_conf] flags
| modify = foldl addDB [global_conf] flags
| otherwise = foldl addDB [user_conf,global_conf] flags
-- implement the following rules:
-- --user means overlap with the user database
......@@ -302,7 +302,7 @@ readParseDatabase :: PackageDBName -> IO (PackageDBName,PackageDB)
readParseDatabase filename = do
str <- readFile filename
let packages = read str
evaluate packages
Exception.evaluate packages
`Exception.catch` \_ ->
die (filename ++ ": parse error in package config file")
return (filename,packages)
......@@ -834,6 +834,7 @@ oldRunit clis = do
prog <- getProgramName
die (usageInfo (usageHeader prog) flags)
my_head :: String -> [a] -> a
my_head s [] = error s
my_head s (x:xs) = x
......
......@@ -76,6 +76,7 @@ Version.hs : Makefile $(TOP)/mk/version.mk
@$(RM) -f $(VERSION_HS)
@echo "Creating $(VERSION_HS) ... "
@echo "module Version where" >>$(VERSION_HS)
@echo "version, targetOS, targetARCH :: String" >>$(VERSION_HS)
@echo "version = \"$(ProjectVersion)\"" >> $(VERSION_HS)
@echo "targetOS = \"$(TargetOS_CPP)\"" >> $(VERSION_HS)
@echo "targetARCH = \"$(TargetArch_CPP)\"" >> $(VERSION_HS)
......
Supports Markdown
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