[Mboost-commits] r760 - in pkg: mboostDevel/R mboostPatch/R

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

Author: hofner
Date: 2014-02-04 16:09:34 +0100 (Tue, 04 Feb 2014)
New Revision: 760

Modified:
   pkg/mboostDevel/R/AAA.R
   pkg/mboostPatch/R/AAA.R
Log:
- fixed package startup messages


Modified: pkg/mboostDevel/R/AAA.R
===================================================================
--- pkg/mboostDevel/R/AAA.R	2014-01-20 09:45:29 UTC (rev 759)
+++ pkg/mboostDevel/R/AAA.R	2014-02-04 15:09:34 UTC (rev 760)
@@ -26,9 +26,7 @@
 .onAttach <- function(libname, pkgname) {
 
     ## get package version
-    vers <- library(help = "mboostDevel")$info[[1]]
-    vers <- vers[grep("Version", vers)]
-    vers <- gsub("(Version.* )([0-9]+\\.[0-9]+-[0-9]+)", "\\2", vers)
+    vers <- packageDescription("mboostDevel")[["Version"]]
 
     packageStartupMessage("This is mboostDevel ", vers, ". ", "See ",
                           sQuote("package?mboostDevel"), " and the NEWS file\n",

Modified: pkg/mboostPatch/R/AAA.R
===================================================================
--- pkg/mboostPatch/R/AAA.R	2014-01-20 09:45:29 UTC (rev 759)
+++ pkg/mboostPatch/R/AAA.R	2014-02-04 15:09:34 UTC (rev 760)
@@ -26,12 +26,10 @@
 .onAttach <- function(libname, pkgname) {
 
     ## get package version
-    vers <- library(help = "mboost")$info[[1]]
-    vers <- vers[grep("Version", vers)]
-    vers <- gsub("(Version.* )([0-9]+\\.[0-9]+-[0-9]+)", "\\2", vers)
+    vers <- packageDescription("mboost")[["Version"]]
 
-    packageStartupMessage("This is mboostDevel ", vers, ". ", "See ",
-                          sQuote("package?mboostDevel"), " and the NEWS file\n",
+    packageStartupMessage("This is mboost ", vers, ". ", "See ",
+                          sQuote("package?mboost"), " and the NEWS file\n",
                           "for a complete list of changes.\n",
                           "Note: The default for the computation",
                           " of the degrees of freedom has changed.\n",