Drop LibPath hack from c68715.

git-svn-id: https://svn.r-project.org/R/trunk@88456 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: hornik

src/library/base/R/library.R

@@ -376,7 +376,9 @@ function(package, help, pos = 2, lib.loc = NULL, character.only = FALSE,
                     }
                 }
 		tt <- tryCatch({
-                    attr(package, "LibPath") <- which.lib.loc
+                    ## <FIXME c68715>
+                    ## attr(package, "LibPath") <- which.lib.loc
+                    ## </FIXME>
                     ns <- loadNamespace(package, lib.loc)
                     env <- attachNamespace(ns, pos = pos, deps,
                                            exclude, include.only)
@@ -392,7 +394,9 @@ function(package, help, pos = 2, lib.loc = NULL, character.only = FALSE,
 		if(logical.return && is.null(tt))
 		    return(FALSE)
 
-                attr(package, "LibPath") <- NULL
+                ## <FIXME c68715>
+                ## attr(package, "LibPath") <- NULL
+                ##
                 {
                     on.exit(detach(pos = pos))
                     ## If there are S4 generics then the package should

src/library/base/R/namespace.R

@@ -184,7 +184,9 @@ loadNamespace <- function (package, lib.loc = NULL,
                            partial = FALSE, versionCheck = NULL,
                            keep.parse.data = getOption("keep.parse.data.pkgs"))
 {
-    libpath <- attr(package, "LibPath")
+    ## <FIXME c68715> 
+    ## libpath <- attr(package, "LibPath")
+    ## </FIXME>
     package <- as.character(package)[[1L]]
 
     loading <- dynGet("__NameSpacesLoading__", NULL)
@@ -360,7 +362,10 @@ loadNamespace <- function (package, lib.loc = NULL,
 
         ## find package, allowing a calling handler to retry if not found.
         ## could move the retry functionality into find.package.
-        fp.lib.loc <- c(libpath, lib.loc)
+        ## <FIXME c68715>
+        ## fp.lib.loc <- c(libpath, lib.loc)
+        fp.lib.loc <- lib.loc
+        ## </FIXME>
         pkgpath <- find.package(package, fp.lib.loc, quiet = TRUE)
         if (length(pkgpath) == 0L) {
             cond <- packageNotFoundError(package, fp.lib.loc, sys.call())