Skip to content

Commit

Permalink
Re haskell#7670: use cmd 'get' instead of 'unpack'
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasabel committed Oct 7, 2021
1 parent ffa806f commit 026f944
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cabal-testsuite/PackageTests/Unpack/T7248/cabal.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cabal unpack
# cabal get
Warning: <ROOT>/cabal.config: Unrecognized stanza on line 3
Warning: The package list for 'x.y.z' does not exist. Run 'cabal update' to download it.
Error: cabal: There is no package named 'a-b-s-e-n-t'.
Expand Down
2 changes: 1 addition & 1 deletion cabal-testsuite/PackageTests/Unpack/T7248/cabal.test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ main = cabalTest $
fails $
cabalG
[ "--config-file", "cabal.config" ]
"unpack"
"get"
[ "a-b-s-e-n-t" ]
10 changes: 9 additions & 1 deletion cabal-testsuite/src/Test/Cabal/Prelude.hs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,15 @@ cabalGArgs global_args cmd args input = do
-- overwritable
when (cmd == "v1-freeze") requireHasSourceCopy
let extra_args
| cmd `elem` ["v1-update", "outdated", "user-config", "man", "v1-freeze", "check", "unpack"]
| cmd `elem`
[ "v1-update"
, "outdated"
, "user-config"
, "man"
, "v1-freeze"
, "check"
, "get", "unpack"
]
= [ ]

-- new-build commands are affected by testCabalProjectFile
Expand Down

0 comments on commit 026f944

Please sign in to comment.