From a7d161cfac28d2ffff12fb375dbb7b0ae3db6713 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 22 Jun 2017 07:09:14 -0600
Subject: [PATCH] raco pkg update: fix `--update-deps` and cross-scope deps

When `--update-deps` (which is implied by `--all`) was used on
user-scope packages that depend on installation-scope packages, the
installation-scope dependencies were treated as missing, which forced
an update of the user-scope packages. Check both scopes for
dependencies.

Closes #1730
---
 pkgs/racket-test/tests/pkg/test-catalogs-api.rkt     |  2 +-
 .../tests/pkg/test-pkgs/pkg-test2/info.rkt           |  3 ++-
 racket/collects/pkg/private/install.rkt              | 12 ++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/racket-test/tests/pkg/test-catalogs-api.rkt b/pkgs/racket-test/tests/pkg/test-catalogs-api.rkt
index 521063f96b..fc987ae7c8 100644
--- a/pkgs/racket-test/tests/pkg/test-catalogs-api.rkt
+++ b/pkgs/racket-test/tests/pkg/test-catalogs-api.rkt
@@ -43,4 +43,4 @@
 
   (define-values (cksum2 mods2 deps2) 
     (get-pkg-content (pkg-desc "pkg-test2" 'name #f #f #f)))
-  (check-equal? deps2 '("pkg-test1")))
+  (check-equal? (sort deps2 string<?) '("base" "pkg-test1")))
diff --git a/pkgs/racket-test/tests/pkg/test-pkgs/pkg-test2/info.rkt b/pkgs/racket-test/tests/pkg/test-pkgs/pkg-test2/info.rkt
index 9b7e40471e..959f6c38d8 100644
--- a/pkgs/racket-test/tests/pkg/test-pkgs/pkg-test2/info.rkt
+++ b/pkgs/racket-test/tests/pkg/test-pkgs/pkg-test2/info.rkt
@@ -2,4 +2,5 @@
 
 (define collection 'multi)
 
-(define deps (list "pkg-test1"))
+(define deps (list "pkg-test1"
+                   "base"))
diff --git a/racket/collects/pkg/private/install.rkt b/racket/collects/pkg/private/install.rkt
index 56cbbd6f92..cf15920bec 100644
--- a/racket/collects/pkg/private/install.rkt
+++ b/racket/collects/pkg/private/install.rkt
@@ -434,7 +434,8 @@
                                         (set-member? implies name))
                                     (not (hash-ref simultaneous-installs name #f))
                                     (let ([updater
-                                           (packages-to-update download-printf current-scope-db 
+                                           (packages-to-update download-printf current-scope-db
+                                                               #:all-db all-db
                                                                #:must-update? #f
                                                                #:deps? do-update-deps?
                                                                #:implies? update-implies?
@@ -546,8 +547,8 @@
             ;; Try updates:
             (define update-pkgs (map car update-deps))
             (define (make-pre-succeed)
-              (define db current-scope-db)
-              (let ([to-update (let ([updater (packages-to-update download-printf db
+              (let ([to-update (let ([updater (packages-to-update download-printf current-scope-db
+                                                                  #:all-db all-db
                                                                   #:deps? update-deps? 
                                                                   #:implies? update-implies?
                                                                   #:update-cache update-cache
@@ -1010,6 +1011,7 @@
 ;; it maps a package name to a checksum, and a box of the package
 ;; name to #t (to avoid multiple update attempts).
 (define ((packages-to-update download-printf db
+                             #:all-db all-db
                              #:must-update? [must-update? #t]
                              #:deps? deps?
                              #:implies? implies?
@@ -1135,7 +1137,7 @@
           (define missing-deps
             (for/list ([dep (in-list deps)]
                        #:unless (equal? dep "racket")
-                       #:unless (package-info dep #:db db #f))
+                       #:unless (package-info dep #:db all-db #f))
               dep))
           (cond
            [(pair? missing-deps)
@@ -1262,6 +1264,7 @@
   (define download-printf (if quiet? void printf/flush))
   (define metadata-ns (make-metadata-namespace))
   (define db (read-pkg-db))
+  (define all-db (merge-pkg-dbs))
   (define all-mode? (and all? (empty? in-pkgs)))
   (define pkgs (cond
                 [all-mode? (hash-keys db)]
@@ -1278,6 +1281,7 @@
    prefetch-group
    (lambda ()
      (define to-updat* (let ([updater (packages-to-update download-printf db
+                                                          #:all-db all-db
                                                           #:must-update? (and (not all-mode?)
                                                                               (not update-deps?))
                                                           #:deps? (or update-deps?