[rkward-cvs] SF.net SVN: rkward:[2712] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 2712
          http://rkward.svn.sourceforge.net/rkward/?rev=2712&view=rev
Author:   tfry
Date:     2009-11-26 19:48:16 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
Fix breakage in rk.make.repos.string

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2009-11-26 11:02:20 UTC (rev 2711)
+++ trunk/rkward/ChangeLog	2009-11-26 19:48:16 UTC (rev 2712)
@@ -1,3 +1,5 @@
+- Fixed: Removing "@CRAN@" from the repositories would break package installation
+
 --- Version 0.5.2 - Oct-26-2009
 - Add Stata data file import plugin (by Michael Ash)
 - All directly accessible plugins now have at least one automated test

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R	2009-11-26 11:02:20 UTC (rev 2711)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R	2009-11-26 19:48:16 UTC (rev 2712)
@@ -283,7 +283,7 @@
 		} else {
 			ret <- sprintf ("%s, ", ret)
 		}
-		if (names (x)[i] != "") {
+		if (!(is.null (names (x)) || (names (x)[i] == ""))) {
 			ret <- sprintf ("%s%s=\"%s\"", ret, names (x)[i], x[i])
 		} else {
 			ret <- sprintf ("%s\"%s\"", ret, x[i])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.