From d195e3889b375528d24eaf4bcb844459f2683e33 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 11 Apr 2013 09:34:49 -0600 Subject: [PATCH] raco pkg: fix `raco setup' sensitivity to package scope Merge to v5.3.4 --- collects/pkg/main.rkt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/collects/pkg/main.rkt b/collects/pkg/main.rkt index 8314626d7f..7b651b69a1 100644 --- a/collects/pkg/main.rkt +++ b/collects/pkg/main.rkt @@ -6,9 +6,10 @@ "commands.rkt" (prefix-in setup: setup/setup)) -(define (setup no-setup? installation? setup-collects) +(define (setup no-setup? setup-collects) (unless (or no-setup? (not (member (getenv "PLT_PKG_NOSETUP") '(#f "")))) + (define installation? (current-install-system-wide?)) (setup:setup #:make-user? (not installation?) #:collections (and setup-collects @@ -87,7 +88,7 @@ #:ignore-checksums? ignore-checksums (for/list ([p (in-list pkg-source)]) (pkg-desc p (or (and link 'link) type) name #f)))) - (setup no-setup installation setup-collects))))] + (setup no-setup setup-collects))))] [update "Update packages" #:once-each @@ -126,7 +127,7 @@ #:dep-behavior deps #:deps? update-deps)) (when setup-collects - (setup no-setup installation setup-collects)))))] + (setup no-setup setup-collects)))))] [remove "Remove packages" #:once-each @@ -152,7 +153,7 @@ (remove-packages pkgs #:auto? auto #:force? force) - (setup no-setup installation #f))))] + (setup no-setup #f))))] [show "Show information about installed packages" #:once-each