Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
5c70361b
Commit
5c70361b
authored
Jul 21, 2014
by
Mikhail Glushenkov
Browse files
Merge pull request #2006 from saturday06/read_installed_package_config_as_utf8
Read installed package info file as UTF-8
parents
90811eb4
44a261d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Install.hs
View file @
5c70361b
...
...
@@ -116,7 +116,7 @@ import qualified Distribution.Simple.Setup as Cabal
,
testCommand
,
TestFlags
(
..
),
emptyTestFlags
)
import
Distribution.Simple.Utils
(
createDirectoryIfMissingVerbose
,
rawSystemExit
,
comparing
,
writeFileAtomic
,
withTempFile
,
withFileContents
)
,
writeFileAtomic
,
withTempFile
,
with
UTF8
FileContents
)
import
Distribution.Simple.InstallDirs
as
InstallDirs
(
PathTemplate
,
fromPathTemplate
,
toPathTemplate
,
substPathTemplate
,
initialPathTemplateEnv
,
installDirsTemplateEnv
)
...
...
@@ -1350,7 +1350,7 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
Cabal
.
regGenPkgConf
=
toFlag
(
Just
pkgConfFile
)
}
setup
Cabal
.
registerCommand
registerFlags'
mLogPath
withFileContents
pkgConfFile
$
\
pkgConfText
->
with
UTF8
FileContents
pkgConfFile
$
\
pkgConfText
->
case
Installed
.
parseInstalledPackageInfo
pkgConfText
of
Installed
.
ParseFailed
perror
->
pkgConfParseFailed
perror
Installed
.
ParseOk
warns
pkgConf
->
do
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment