[Rprotobuf-commits] r436 - in pkg: . R

[noreply at r-forge.r-project.org]

Author: edd
Date: 2012-04-07 19:44:03 +0200 (Sat, 07 Apr 2012)
New Revision: 436

Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/R/zzz.R
Log:
be picker in call to packageDescription() and also use lib.loc=libname as requested by Brian Ripley


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2012-03-21 03:08:40 UTC (rev 435)
+++ pkg/ChangeLog	2012-04-07 17:44:03 UTC (rev 436)
@@ -1,3 +1,8 @@
+2012-04-07  Dirk Eddelbuettel  <edd at debian.org>
+
+	* R/zzz.R: Add 'lib.loc=libname' to packageDescription() call as
+	requested by Brian Ripley
+
 2012-03-20  Dirk Eddelbuettel  <edd at debian.org>
 
 	* Applied another patch by Murray:

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-03-21 03:08:40 UTC (rev 435)
+++ pkg/DESCRIPTION	2012-04-07 17:44:03 UTC (rev 436)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.2.4.1
+Version: 0.2.3.1
 Date: $Date$
 Author: Romain Francois <romain at r-enthusiasts.com> and Dirk Eddelbuettel <edd at debian.org>
 Maintainer: Romain and Dirk <RomainAndDirk at r-enthusiasts.com>

Modified: pkg/R/zzz.R
===================================================================
--- pkg/R/zzz.R	2012-03-21 03:08:40 UTC (rev 435)
+++ pkg/R/zzz.R	2012-04-07 17:44:03 UTC (rev 436)
@@ -1,14 +1,14 @@
 
 .onLoad <- function(libname, pkgname ){
-	minversion <- packageDescription( pkgname)$MinimumLibProtoVersion
-	minversion <- as.integer( gsub( "[[:space:]]+", "", minversion ) )
-	.Call( "check_libprotobuf_version", minversion, PACKAGE = "RProtoBuf" )
-	readProtoFiles( package = pkgname )
-	attachDescriptorPool( pos = length(search()) )
-	
-	if( exists( ".httpd.handlers.env", asNamespace( "tools" ) ) ){
-		e <- tools:::.httpd.handlers.env
-		e[["RProtoBuf"]] <- RProtoBuf.http.handler
-	}
+    minversion <- packageDescription(pkgname, lib.loc=libname)$MinimumLibProtoVersion
+    minversion <- as.integer( gsub( "[[:space:]]+", "", minversion ) )
+    .Call( "check_libprotobuf_version", minversion, PACKAGE = "RProtoBuf" )
+    readProtoFiles( package = pkgname )
+    attachDescriptorPool( pos = length(search()) )
+
+    if( exists( ".httpd.handlers.env", asNamespace( "tools" ) ) ){
+        e <- tools:::.httpd.handlers.env
+        e[["RProtoBuf"]] <- RProtoBuf.http.handler
+    }
 }