[rkward-cvs] SF.net SVN: rkward-code:[4702] trunk/rkward/rkward/settings/ rksettingsmoduler.cpp

[m-eik at users.sf.net]

Revision: 4702
          http://sourceforge.net/p/rkward/code/4702
Author:   m-eik
Date:     2013-04-16 15:06:45 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
R 3.0.0 introdued a new pakage type "mac.binary", replacing the former "mac.binary.leopard". this is important, because this also triggers the use of a slightly different path to packages on the repository, so install.packages() won't find any packages if called with the wrong package type. hope this fixes the issue.

Modified Paths:
--------------
    trunk/rkward/rkward/settings/rksettingsmoduler.cpp

Modified: trunk/rkward/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2013-04-16 14:47:56 UTC (rev 4701)
+++ trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2013-04-16 15:06:45 UTC (rev 4702)
@@ -484,7 +484,12 @@
 #	if defined Q_WS_WIN
 	else ret.append ("win.binary");
 #	else
+#		if R_VERSION < R_Version(3,0,0)
 	else ret.append ("mac.binary.leopard");
+#		else
+	// OS X binary packages have switched repo locations and package type in R >= 3.0.0
+	else ret.append ("mac.binary");
+#		endif
 #	endif
 	ret.append ("\")\n");
 #endif