From c1c12b05f5e4c39efd9f0679b6b9e19c267fde8f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 2 Jun 2014 16:41:28 +0100 Subject: [PATCH] raco pkg: fix conflict checking for PLTCOMPILEDROOTS The fix is for a corner case that is unlikely to show up, but the repaired code is simpler. --- racket/collects/pkg/lib.rkt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/racket/collects/pkg/lib.rkt b/racket/collects/pkg/lib.rkt index d635149041..97e0de1401 100644 --- a/racket/collects/pkg/lib.rkt +++ b/racket/collects/pkg/lib.rkt @@ -28,6 +28,7 @@ version/utils syntax/modcollapse syntax/modread + compiler/compilation-path "name.rkt" "util.rkt" "strip.rkt" @@ -1565,11 +1566,8 @@ [(and f (or (file-exists? f) (file-exists? (path-replace-suffix f #".ss")) - (let-values ([(base name dir?) (split-path f)]) - (or (file-exists? (build-path base "compiled" (path-add-suffix name #".zo"))) - (file-exists? (build-path base "compiled" (path-add-suffix - (path-replace-suffix name #".ss") - #".zo")))))) + (file-exists? (get-compilation-bytecode-file f)) + (file-exists? (get-compilation-bytecode-file (path-replace-suffix f #".ss")))) (or (not updating?) (not (equal? pkg-name (path->pkg f #:cache path-pkg-cache))))) ;; This module is already installed