[Genabel-commits] r1083 - in pkg/GenABEL: . R

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

Author: yurii
Date: 2013-01-07 10:15:34 +0100 (Mon, 07 Jan 2013)
New Revision: 1083

Modified:
   pkg/GenABEL/CHANGES.LOG
   pkg/GenABEL/DESCRIPTION
   pkg/GenABEL/R/checkPackageVersionOnCRAN.R
   pkg/GenABEL/R/zzz.R
Log:
fixing the problem preventing GenA from loading

Modified: pkg/GenABEL/CHANGES.LOG
===================================================================
--- pkg/GenABEL/CHANGES.LOG	2013-01-02 16:29:45 UTC (rev 1082)
+++ pkg/GenABEL/CHANGES.LOG	2013-01-07 09:15:34 UTC (rev 1083)
@@ -1,5 +1,8 @@
-***  v. 1.7-3 (2012.12.03)
+***  v. 1.7-3 (2013.01.07)
 
+(2013.01.07)
+Fixing the problem which prevents the package from loading while checking the version on CRAN
+
 (2012.12.03, YA) 
 - Changes in DESCRIPTION and version to denote new working 
 version

Modified: pkg/GenABEL/DESCRIPTION
===================================================================
--- pkg/GenABEL/DESCRIPTION	2013-01-02 16:29:45 UTC (rev 1082)
+++ pkg/GenABEL/DESCRIPTION	2013-01-07 09:15:34 UTC (rev 1083)
@@ -2,7 +2,7 @@
 Type: Package
 Title: genome-wide SNP association analysis
 Version: 1.7-3
-Date: 2012-12-03
+Date: 2013-01-07
 Author: GenABEL project developers
 Contact: GenABEL project developers <genabel.project at gmail.com>
 Maintainer: Yurii Aulchenko <yurii at bionet.nsc.ru>

Modified: pkg/GenABEL/R/checkPackageVersionOnCRAN.R
===================================================================
--- pkg/GenABEL/R/checkPackageVersionOnCRAN.R	2013-01-02 16:29:45 UTC (rev 1082)
+++ pkg/GenABEL/R/checkPackageVersionOnCRAN.R	2013-01-07 09:15:34 UTC (rev 1083)
@@ -50,7 +50,7 @@
 	# if failed in reading (pageContent is "try-error"), return NULL
 	if (class(pageContent) == "try-error") return(NULL)
 	# parse the page and get string starting with "Package source:"
-	targetLine <- pageContent[grep("Package source:",pageContent)]
+	targetLine <- pageContent[grep("source:",pageContent)]
 	# split the string at "Package_" and ".tar.gz"; the element before the last will contain the version
 	splitPattern <- paste(packageName,"_|.tar.gz",sep="")
 	stringSplit <- strsplit(targetLine,splitPattern)

Modified: pkg/GenABEL/R/zzz.R
===================================================================
--- pkg/GenABEL/R/zzz.R	2013-01-02 16:29:45 UTC (rev 1082)
+++ pkg/GenABEL/R/zzz.R	2013-01-07 09:15:34 UTC (rev 1083)
@@ -5,11 +5,11 @@
 	#pkgVersion <- pkgDescription$Version
 	#pkgDate <- pkgDescription$Date
 	pkgVersion <- "1.7-3"
-	pkgDate <- "December 03, 2012"
+	pkgDate <- "January 07, 2013"
 	welcomeMessage <- paste(pkg," v. ",pkgVersion," (",pkgDate,") loaded\n",sep="")
 	# check if CRAN version is the same as loaded
-	cranVersion <- checkPackageVersionOnCRAN(pkg)
-	if (!is.null(cranVersion)) 
+	cranVersion <- try( checkPackageVersionOnCRAN(pkg) )
+	if (!is.null(cranVersion) & !( class(cranVersion) == "try-error") ) 
 		if (pkgVersion != cranVersion) {
 			welcomeMessage <- paste(welcomeMessage,
 					"\nInstalled ",pkg," version (",pkgVersion,") is not the same as stable\n",