Use the proper destdir for cleanup_dependencies (#135)

JuliaPackaging · Apr 18, 2021 · 1692d85 · 1692d85
1 parent 1204d3e
commit 1692d85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Prefix.jl b/src/Prefix.jl
@@ -517,13 +517,13 @@ function setup_dependencies(prefix::Prefix, dependencies::Vector{PkgSpec}, platf
  return artifact_paths
 end
 
-function cleanup_dependencies(prefix::Prefix, artifact_paths)
+function cleanup_dependencies(prefix::Prefix, artifact_paths, platform)
  for art_path in artifact_paths
  # Unsymlink all destdirs within the prefix
  for dir in readdir(prefix.path; join=true)
- destdir = joinpath(dir, "destdir")
- if isdir(destdir)
- unsymlink_tree(art_path, destdir)
+ ddir = destdir(prefix, platform)
+ if isdir(ddir)
+ unsymlink_tree(art_path, ddir)
  end
  end
  end

diff --git a/test/dependencies.jl b/test/dependencies.jl
@@ -105,7 +105,7 @@ end
  @test readdir(joinpath(destdir(dir, platform), "logs")) == ["Zlib.log.gz"]
 
  # Make sure the directories are emptied by `cleanup_dependencies`
- @test_nowarn cleanup_dependencies(prefix, ap)
+ @test_nowarn cleanup_dependencies(prefix, ap, platform)
  @test readdir(joinpath(destdir(dir, platform), "include")) == []
  @test readdir(joinpath(destdir(dir, platform), "logs")) == []
  end
@@ -123,7 +123,7 @@ end
  @test "libssh2." * platform_dlext(platform) in readdir(last(libdirs(Prefix(destdir(dir, platform)))))
 
  # Make sure the directories are emptied by `cleanup_dependencies`
- @test_nowarn cleanup_dependencies(prefix, ap)
+ @test_nowarn cleanup_dependencies(prefix, ap, platform)
  # This shuld be empty, but the `curl/` directory is left here, empty
  @test_broken readdir(joinpath(destdir(dir, platform), "include")) == []
  @test readdir(joinpath(destdir(dir, platform), "logs")) == []