From f2bd91c8ec93d90ec16973df7655a83bc0005386 Mon Sep 17 00:00:00 2001
From: Jacob Matthews <jacobm@cs.uchicago.edu>
Date: Tue, 28 Nov 2006 16:15:45 +0000
Subject: [PATCH] Fix bug that would crash planet in some cases if certain
 subdirectories didn't exist

svn: r4969
---
 collects/planet/resolver.ss  |  2 +-
 collects/setup/setup-unit.ss | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/collects/planet/resolver.ss b/collects/planet/resolver.ss
index cb02ea11a5..6258dd8db6 100644
--- a/collects/planet/resolver.ss
+++ b/collects/planet/resolver.ss
@@ -448,8 +448,8 @@ attempted to load version ~a.~a while version ~a.~a was already loaded"
                             (number->string maj)
                             (number->string min))]
            [full-pkg-path (build-path dir name)])
+      (make-directory* dir)
       (unless (equal? (normalize-path (uninstalled-pkg-path uninst-p)) (normalize-path full-pkg-path))
-        (make-directory* dir)
         (when (file-exists? full-pkg-path) (delete-file full-pkg-path))
         (copy-file (uninstalled-pkg-path uninst-p) full-pkg-path))
       full-pkg-path))
diff --git a/collects/setup/setup-unit.ss b/collects/setup/setup-unit.ss
index 7ec1aaff10..8e398e1a40 100644
--- a/collects/setup/setup-unit.ss
+++ b/collects/setup/setup-unit.ss
@@ -83,6 +83,10 @@
 			   (current-target-plt-directory-getter)))
 	      (archives))))
       
+      ;; specific-planet-dir ::=
+      ;;    - (list path[directory] string[owner] string[package-name] (listof string[extra package path]) Nat[maj] Nat[min]), or
+      ;;    - (list string[owner] string[package-name] string[maj as string] string[min as string])
+      ;; x-specific-planet-dir ::= (listof specific-planet-dir)
       (define x-specific-planet-dirs (specific-planet-dirs))
       
       (define (done)
@@ -148,15 +152,17 @@
       ;; planet-spec->planet-list : (list string string nat nat) -> (list path string string (listof string) nat nat) | #f
       ;; converts a planet package spec into the information needed to create a cc structure
       (define (planet-spec->planet-list spec)
-        (let-values ([(owner pkg-name maj-str min-str) (apply values spec)])
-          (let ([maj (string->number maj-str)]
-                [min (string->number min-str)])
-            (unless maj (error 'setup-plt "Bad major version for PLaneT package: ~s" maj-str))
-            (unless min (error 'setup-plt "Bad minor version for PLaneT package: ~s" min-str))
-            (let ([pkg (lookup-package-by-keys owner pkg-name maj min min)])
-              (if pkg
-                  pkg
-                  (error 'setup-plt "Not an installed PLaneT package: (~s ~s ~s ~s)" owner pkg-name maj min))))))
+        (match spec
+          [(owner pkg-name maj-str min-str)
+           (let ([maj (string->number maj-str)]
+                 [min (string->number min-str)])
+             (unless maj (error 'setup-plt "Bad major version for PLaneT package: ~s" maj-str))
+             (unless min (error 'setup-plt "Bad minor version for PLaneT package: ~s" min-str))
+             (let ([pkg (lookup-package-by-keys owner pkg-name maj min min)])
+               (if pkg
+                   pkg
+                   (error 'setup-plt "Not an installed PLaneT package: (~s ~s ~s ~s)" owner pkg-name maj min))))]
+          [_ spec]))
       
       (define (planet->cc path owner pkg-file extra-path maj min)
         (unless (path? path)