From de230bc1efcf02e29827241bdb53fc571e7072e8 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 4 Aug 2013 09:49:49 -0600 Subject: [PATCH] Revert "make user PLaneT install path use installation name instead of version" This reverts commit ac20e7fc0d0e60874cc0b47e5d15727e412f5500. Using the installation name name seems right, but it creates sandbox trouble, since finding the instalation name requires several path-chasing steps. I think the sandbox problem shoudl be fixed, somehow, but since I don't have a good idea right now, I'm reverting the PLaneT change. --- pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl | 7 +++---- racket/collects/planet/config.rkt | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl b/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl index 276f6c3c29..e9f1f2d72c 100644 --- a/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl +++ b/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl @@ -9,8 +9,7 @@ planet/util planet/version planet/syntax - planet/scribble - setup/dirs)) + planet/scribble)) @title{Utility Libraries} @@ -151,7 +150,7 @@ manually edit the @filepath{config.rkt} file. @defparam[PLANET-DIR dir path-string?]{ The root of the version-specific PLaneT files. -Defaults to @racket[(build-path (PLANET-BASE-DIR) (get-installation-name))]. +Defaults to @racket[(build-path (PLANET-BASE-DIR) (version))]. } @defparam[CACHE-DIR dir path-string?]{ @@ -207,7 +206,7 @@ The port on the server the client should connect to if @defparam[HARD-LINK-FILE file path?]{ The name of the file where hard links are saved. Defaults to - @racket[(build-path (PLANET-BASE-DIR) (get-installation-name) "HARD-LINKS")]. + @racket[(build-path (PLANET-BASE-DIR) (version) "HARD-LINKS")]. } @defparam[PLANET-ARCHIVE-FILTER regexp-filter (or/c #f string? regexp?)]{ A regular-expression based filter that is used to skip files when building a @|PLaneT| archive. diff --git a/racket/collects/planet/config.rkt b/racket/collects/planet/config.rkt index e25aa01f7e..8ce76909f1 100644 --- a/racket/collects/planet/config.rkt +++ b/racket/collects/planet/config.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require "private/define-config.rkt" - setup/dirs) +(require "private/define-config.rkt") (define-parameters (PLANET-SERVER-NAME "planet.racket-lang.org") (PLANET-SERVER-PORT 270) @@ -11,11 +10,11 @@ (build-path (find-system-path 'addon-dir) "planet" (PLANET-CODE-VERSION))))) - (PLANET-DIR (build-path (PLANET-BASE-DIR) (get-installation-name))) + (PLANET-DIR (build-path (PLANET-BASE-DIR) (version))) (CACHE-DIR (build-path (PLANET-DIR) "cache")) (UNINSTALLED-PACKAGE-CACHE (build-path (PLANET-BASE-DIR) "packages")) (LINKAGE-FILE (build-path (PLANET-DIR) "LINKAGE")) - (HARD-LINK-FILE (build-path (PLANET-BASE-DIR) (get-installation-name) "HARD-LINKS")) + (HARD-LINK-FILE (build-path (PLANET-BASE-DIR) (version) "HARD-LINKS")) (LOG-FILE (build-path (PLANET-DIR) "INSTALL-LOG")) (DEFAULT-PACKAGE-LANGUAGE (version))