Correct PackageIdentifier->PackageName (fixes #4215)

commercialhaskell · Aug 14, 2018 · 0657080 · 0657080
1 parent 97fa18c
commit 0657080
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 1 deletion.
diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
@@ -321,7 +321,8 @@ mkUnregisterLocal tasks dirtyReason localDumpPkgs sourceMap initialBuildSteps =
       -- None of the above, keep it!
       | otherwise = Nothing
       where
-        name = displayC ident
+        name :: PackageName
+        name = pkgName ident
 
 -- | Given a 'LocalPackage' and its 'lpTestBench', adds a 'Task' for
 -- running its tests and benchmarks.

diff --git a/test/integration/tests/4215-missing-unregister/Main.hs b/test/integration/tests/4215-missing-unregister/Main.hs
@@ -0,0 +1,6 @@
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "--stack-yaml", "stack1.yaml"]
+  stack ["build", "--stack-yaml", "stack2.yaml"]
diff --git a/test/integration/tests/4215-missing-unregister/files/.gitignore b/test/integration/tests/4215-missing-unregister/files/.gitignore
@@ -0,0 +1 @@
+foo.cabal
diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml
@@ -0,0 +1,3 @@
+resolver: ghc-8.2.2
+packages:
+- v1
diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml
@@ -0,0 +1,3 @@
+resolver: ghc-8.2.2
+packages:
+- v2
diff --git a/test/integration/tests/4215-missing-unregister/files/v1/package.yaml b/test/integration/tests/4215-missing-unregister/files/v1/package.yaml
@@ -0,0 +1,7 @@
+name: foo
+version: 1
+
+dependencies:
+- base
+
+library: {}
diff --git a/test/integration/tests/4215-missing-unregister/files/v2/package.yaml b/test/integration/tests/4215-missing-unregister/files/v2/package.yaml
@@ -0,0 +1,7 @@
+name: foo
+version: 2
+
+dependencies:
+- base
+
+library: {}