suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug that would crash planet in some cases if certain subdirectories didn't exist

Browse Source 
svn: r4969
This commit is contained in:
Jacob Matthews 2006-11-28 16:15:45 +00:00
parent 41fc79dc0b
commit f2bd91c8ec
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collects/planet/resolver.ss
View File

@ -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))

24
collects/setup/setup-unit.ss
View File

@ -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)