Merge pull request #5701 from haskell/fix-5699

new-clean should not delete dist-newstyle/src (cherry picked from commit 3dfc642)
haskell · Nov 21, 2018 · c549d9e · c549d9e
1 parent 5c49e01
commit c549d9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/cabal-install/Distribution/Client/CmdClean.hs b/cabal-install/Distribution/Client/CmdClean.hs
@@ -96,10 +96,6 @@ cleanAction CleanFlags{..} extraArgs _ = do
             when buildRootExists $ do
                 info verbosity ("Deleting build root (" ++ buildRoot ++ ")")
                 handleDoesNotExist () $ removeDirectoryRecursive buildRoot
-
-            when unpackedSrcRootExists $ do
-                info verbosity ("Deleting unpacked source root (" ++ unpackedSrcRoot ++ ")")
-                handleDoesNotExist () $ removeDirectoryRecursive unpackedSrcRoot
         else do
             let distRoot = distDirectory distLayout
 

diff --git a/cabal-install/changelog b/cabal-install/changelog
@@ -1,6 +1,7 @@
 -*-change-log-*-
 
 2.4.0.1 (current bugfix version)
+	* new-clean no longer deletes dist-newstyle/src with `-s`. (#5699)
 	* 'new-install' now warns when failing to symlink an exe (#5602)
 	* Extend 'cabal init' support for 'cabal-version' selection (#5567)
 	* 'new-sdist' now generates tarballs with file modification