Repository : ssh://[email protected]/Cabal On branch : ghc-head Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=f2a5929b55d11dc2c435462e4cc4d6526cac2660
>--------------------------------------------------------------- commit f2a5929b55d11dc2c435462e4cc4d6526cac2660 Author: Mikhail Glushenkov <[email protected]> Date: Fri Aug 30 03:04:22 2013 +0200 Make 'delete-source' point the user to 'sandbox hc-pkg'. See #1447. >--------------------------------------------------------------- f2a5929b55d11dc2c435462e4cc4d6526cac2660 cabal-install/Distribution/Client/Sandbox.hs | 4 ++++ cabal-install/Distribution/Client/Setup.hs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cabal-install/Distribution/Client/Sandbox.hs b/cabal-install/Distribution/Client/Sandbox.hs index fc137d3..cdd9f2d 100644 --- a/cabal-install/Distribution/Client/Sandbox.hs +++ b/cabal-install/Distribution/Client/Sandbox.hs @@ -429,6 +429,10 @@ sandboxDeleteSource verbosity buildTreeRefs _sandboxFlags globalFlags = do withRemoveTimestamps sandboxDir $ do Index.removeBuildTreeRefs verbosity indexFile buildTreeRefs + notice verbosity $ "Note: 'sandbox delete-source' only deletes the" ++ + "add-source record, but does not unregister the package " ++ + "from the package DB.\n\nUse 'sandbox hc-pkg -- unregister' to do that." + -- | Entry point for the 'cabal sandbox list-sources' command. sandboxListSources :: Verbosity -> SandboxFlags -> GlobalFlags -> IO () diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs index 9301c26..f302ec7 100644 --- a/cabal-install/Distribution/Client/Setup.hs +++ b/cabal-install/Distribution/Client/Setup.hs @@ -1397,7 +1397,7 @@ sandboxCommand = CommandUI { "Usage: " ++ pname ++ " sandbox init\n" ++ " or: " ++ pname ++ " sandbox delete\n" ++ " or: " ++ pname ++ " sandbox add-source [PATHS]\n\n" - ++ " or: " ++ pname ++ " sandbox hc-pkg [ARGS]\n" + ++ " or: " ++ pname ++ " sandbox hc-pkg -- [ARGS]\n" ++ " or: " ++ pname ++ " sandbox list-sources\n\n" ++ "Flags for sandbox:", _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
