Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a246841cf7c4c00ca2429d2a9fc8431f5faf0007 >--------------------------------------------------------------- commit a246841cf7c4c00ca2429d2a9fc8431f5faf0007 Author: Duncan Coutts <[email protected]> Date: Sun Feb 13 16:51:51 2011 +0000 Remove unnecessary Maybe from LocalUnpackedPackage dir filepath We can just use "." instead of Nothing >--------------------------------------------------------------- cabal-install/Distribution/Client/Configure.hs | 2 +- cabal-install/Distribution/Client/Install.hs | 4 ++-- cabal-install/Distribution/Client/Types.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/Distribution/Client/Configure.hs index 8e3d177..1df71e8 100644 --- a/cabal-install/Distribution/Client/Configure.hs +++ b/cabal-install/Distribution/Client/Configure.hs @@ -143,7 +143,7 @@ planLocalPackage verbosity comp configFlags configExFlags installed localPkg = AvailablePackage { packageInfoId = packageId pkg, Available.packageDescription = pkg, - packageSource = LocalUnpackedPackage Nothing + packageSource = LocalUnpackedPackage "." } targets = [packageName pkg] constraints = [PackageVersionConstraint (packageName pkg) diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs index 82f2b63..5eb00c7 100644 --- a/cabal-install/Distribution/Client/Install.hs +++ b/cabal-install/Distribution/Client/Install.hs @@ -276,7 +276,7 @@ planLocalPackage verbosity comp configFlags configExFlags onlyDeps installed localPkg = AvailablePackage { packageInfoId = packageId pkg, Available.packageDescription = pkg, - packageSource = LocalUnpackedPackage Nothing + packageSource = LocalUnpackedPackage "." } targets = [packageName pkg] constraints = [PackageVersionConstraint (packageName pkg) @@ -767,7 +767,7 @@ installAvailablePackage -> (Maybe FilePath -> IO BuildResult) -> IO BuildResult installAvailablePackage _ _ (LocalUnpackedPackage dir) installPkg = - installPkg dir + installPkg (Just dir) installAvailablePackage verbosity pkgid (LocalTarballPackage tarballPath) installPkg = do diff --git a/cabal-install/Distribution/Client/Types.hs b/cabal-install/Distribution/Client/Types.hs index a0da743..c87ae13 100644 --- a/cabal-install/Distribution/Client/Types.hs +++ b/cabal-install/Distribution/Client/Types.hs @@ -103,7 +103,7 @@ instance Package AvailablePackage where packageId = packageInfoId data AvailablePackageSource = -- | An unpacked package in the given dir, or current dir - LocalUnpackedPackage (Maybe FilePath) + LocalUnpackedPackage FilePath -- | A package as a tarball that's available as a local tarball | LocalTarballPackage FilePath _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
