From a89ba74f4eab83206493a7e4e50babf94273b7e3 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 28 Jun 2013 06:57:20 -0600
Subject: [PATCH] raco pkg: fix dependency checking for user and shared scopes

---
 pkgs/racket-pkgs/racket-test/tests/pkg/tests-deps.rkt    | 1 +
 pkgs/racket-pkgs/racket-test/tests/pkg/tests-install.rkt | 3 ++-
 pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt    | 2 +-
 racket/lib/collects/pkg/lib.rkt                          | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-deps.rkt b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-deps.rkt
index 7b53421906..656a569f82 100644
--- a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-deps.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-deps.rkt
@@ -27,6 +27,7 @@
      $ "racket -e '(require pkg-test2)'" =exit> 1
      $ "raco pkg install test-pkgs/pkg-test2.zip" =exit> 1
      $ "raco pkg install test-pkgs/pkg-test1.zip" =exit> 0
+     $ "raco pkg show" =exit> 0
      $ "raco pkg install test-pkgs/pkg-test2.zip" =exit> 0
      $ "racket -e '(require pkg-test2)'" =exit> 0
      $ "racket -e '(require pkg-test2/contains-dep)'" =exit> 0
diff --git a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-install.rkt b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-install.rkt
index 3ec8bc0725..a9da17dbc2 100644
--- a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-install.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-install.rkt
@@ -94,7 +94,8 @@
       $ "racket -e '(require pkg-test1/a)'" =exit> 1
       $ "racket -e '(require pkg/lib)' -e '(path->pkg \"test-pkgs/pkg-test1-linking\")'" =stdout> "\"pkg-test1-linking\"\n"
       $ "racket -e '(require pkg/lib)' -e '(path->pkg \"test-pkgs/pkg-test1-linking/README\")'" =stdout> "\"pkg-test1-linking\"\n"
-      $ "racket -e '(require pkg/lib)' -e '(path->pkg \"test-pkgs\")'" =stdout> "#f\n"
+      $ "racket -e '(require pkg/lib)' -e '(path->pkg \"test-pkgs\")'" =stdout> "\"racket-test\"\n"
+      $ "racket -e '(require pkg/lib)' -e '(path->pkg (collection-file-path \"main.rkt\" \"racket\"))'" =stdout> "#f\n"
       $ "cp test-pkgs/pkg-test1-staging/a.rkt test-pkgs/pkg-test1-linking/pkg-test1/a.rkt"
       $ "racket -e '(require pkg-test1/a)'"
       $ "rm -f test-pkgs/pkg-test1-linking/pkg-test1/a.rkt"
diff --git a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
index 1172b43eeb..cd31e31ffe 100644
--- a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
@@ -38,7 +38,7 @@
   (check-equal-values? (package-source->name+type "fish" 'dir) (values "fish" 'dir))
   (check-equal-values? (package-source->name+type "fish!/" 'dir) (values #f 'dir))
 
-  (check-equal? (package-source->name "http://") #f))
+  (check-equal? (package-source->name "http://") #f)
 
   (check-equal-values? (package-source->name+type "http://racket-lang.org/fish.plt" #f) (values "fish" 'file-url))
   (check-equal-values? (package-source->name+type "https://racket-lang.org/fish.plt" #f) (values "fish" 'file-url))
diff --git a/racket/lib/collects/pkg/lib.rkt b/racket/lib/collects/pkg/lib.rkt
index 24269f6394..fbd1121219 100644
--- a/racket/lib/collects/pkg/lib.rkt
+++ b/racket/lib/collects/pkg/lib.rkt
@@ -440,11 +440,11 @@
            (values k v))]
         [(shared)
          (define db (read-pkg-db))
-         (for/fold ([ht (merge-next-pkg-dbs 'installation)]) ([(v k) (in-hash db)])
+         (for/fold ([ht (merge-next-pkg-dbs 'installation)]) ([(k v) (in-hash db)])
            (hash-set ht k v))]
         [(user)
          (define db (read-pkg-db))
-         (for/fold ([ht (merge-next-pkg-dbs 'shared)]) ([(v k) (in-hash db)])
+         (for/fold ([ht (merge-next-pkg-dbs 'shared)]) ([(k v) (in-hash db)])
            (hash-set ht k v))])))