Skip to content
GitLab
Menu
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
49ecb690
Commit
49ecb690
authored
Dec 22, 2016
by
Mikhail Glushenkov
Committed by
GitHub
Dec 22, 2016
Browse files
Merge pull request #4186 from haskell/echo
Depend on echo to fix #4128
parents
09865f60
0469aba7
Changes
3
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Upload.hs
View file @
49ecb690
...
...
@@ -18,9 +18,9 @@ import qualified Distribution.Client.BuildReports.Upload as BuildReport
import
Network.URI
(
URI
(
uriPath
))
import
Network.HTTP
(
Header
(
..
),
HeaderName
(
..
))
import
System.IO
(
hFlush
,
stdin
,
stdout
,
hGetEcho
,
hSetEcho
)
import
System.IO
(
hFlush
,
stdout
)
import
System.IO.Echo
(
withoutInputEcho
)
import
System.Exit
(
exitFailure
)
import
Control.Exception
(
bracket
)
import
System.FilePath
((
</>
),
takeExtension
,
takeFileName
,
dropExtension
)
import
qualified
System.FilePath.Posix
as
FilePath.Posix
((
</>
))
import
System.Directory
...
...
@@ -140,10 +140,8 @@ promptPassword :: IO Password
promptPassword
=
do
putStr
"Hackage password: "
hFlush
stdout
-- save/restore the terminal echoing status
passwd
<-
bracket
(
hGetEcho
stdin
)
(
hSetEcho
stdin
)
$
\
_
->
do
hSetEcho
stdin
False
-- no echoing for entering the password
fmap
Password
getLine
-- save/restore the terminal echoing status (no echoing for entering the password)
passwd
<-
withoutInputEcho
$
fmap
Password
getLine
putStrLn
""
return
passwd
...
...
cabal-install/bootstrap.sh
View file @
49ecb690
...
...
@@ -259,6 +259,8 @@ BASE64_BYTESTRING_VER="1.0.0.1"; BASE64_BYTESTRING_VER_REGEXP="1\."
# >=1.0
CRYPTOHASH_SHA256_VER
=
"0.11.100.1"
;
CRYPTOHASH_SHA256_VER_REGEXP
=
"0
\.
11
\.
?"
# 0.11.*
ECHO_VER
=
"0.1"
;
ECHO_VER_REGEXP
=
"0
\.
1
\.
?"
# 0.1.*
EDIT_DISTANCE_VER
=
"0.2.2.1"
;
EDIT_DISTANCE_VER_REGEXP
=
"0
\.
2
\.
2
\.
?"
# 0.2.2.*
ED25519_VER
=
"0.0.5.0"
;
ED25519_VER_REGEXP
=
"0
\.
0
\.
?"
...
...
@@ -485,6 +487,7 @@ info_pkg "base64-bytestring" ${BASE64_BYTESTRING_VER} \
${
BASE64_BYTESTRING_VER_REGEXP
}
info_pkg
"cryptohash-sha256"
${
CRYPTOHASH_SHA256_VER
}
\
${
CRYPTOHASH_SHA256_VER_REGEXP
}
info_pkg
"echo"
${
ECHO_VER
}
${
ECHO_VER_REGEXP
}
info_pkg
"edit-distance"
${
EDIT_DISTANCE_VER
}
${
EDIT_DISTANCE_VER_REGEXP
}
info_pkg
"ed25519"
${
ED25519_VER
}
${
ED25519_VER_REGEXP
}
info_pkg
"tar"
${
TAR_VER
}
${
TAR_VER_REGEXP
}
...
...
@@ -521,6 +524,7 @@ do_pkg "base64-bytestring" ${BASE64_BYTESTRING_VER} \
${
BASE64_BYTESTRING_VER_REGEXP
}
do_pkg
"cryptohash-sha256"
${
CRYPTOHASH_SHA256_VER
}
\
${
CRYPTOHASH_SHA256_VER_REGEXP
}
do_pkg
"echo"
${
ECHO_VER
}
${
ECHO_VER_REGEXP
}
do_pkg
"edit-distance"
${
EDIT_DISTANCE_VER
}
${
EDIT_DISTANCE_VER_REGEXP
}
do_pkg
"ed25519"
${
ED25519_VER
}
${
ED25519_VER_REGEXP
}
...
...
cabal-install/cabal-install.cabal
View file @
49ecb690
...
...
@@ -349,6 +349,7 @@ executable cabal
containers >= 0.4 && < 0.6,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.3 && < 1.5,
echo >= 0.1 && < 0.2,
edit-distance >= 0.2.2 && < 0.3,
filepath >= 1.3 && < 1.5,
hashable >= 1.0 && < 2,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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