[rkward] rkward/rbackend/rpackages/rkward/R: Avoid a whole bunch of false positive test failures.

[Thomas Friedrichsmeier]

Git commit b478ae81508715c9b73166e901f7699970e14b38 by Thomas Friedrichsmeier.
Committed on 22/03/2016 at 20:38.
Pushed by tfry into branch 'master'.

Avoid a whole bunch of false positive test failures.

M  +4    -2    rkward/rbackend/rpackages/rkward/R/public_graphics.R
M  +1    -1    rkward/rbackend/rpackages/rkward/R/ver.R

http://commits.kde.org/rkward/b478ae81508715c9b73166e901f7699970e14b38

diff --git a/rkward/rbackend/rpackages/rkward/R/public_graphics.R b/rkward/rbackend/rpackages/rkward/R/public_graphics.R
index 915df15..16aeeba 100644
--- a/rkward/rbackend/rpackages/rkward/R/public_graphics.R
+++ b/rkward/rbackend/rpackages/rkward/R/public_graphics.R
@@ -46,10 +46,12 @@
 "rk.graph.on" <- function (device.type=getOption ("rk.graphics.type"), width=getOption ("rk.graphics.width"), height=getOption ("rk.graphics.height"), quality, ...) 
 {
 	make.url <- function (filename) {
-		if (substr (filename, 1, 1) != "/") {  # this generally happens on Windows
+		if (substr (filename, 2, 1) == ":") {  # *very* likely an absolute Windows path like c:\xyz .
 			paste ("file:///", filename, sep="")
-		} else {
+		} else if (substr (filename, 1, 1) == "/") {
 			paste ("file://", filename, sep="")
+		} else { # relative path: return unchanged. NOTE that this will currently happen during automated tesing, only. Usually rk.get.tempfile.name() always returns absolute paths.
+			filename
 		}
 	}
 
diff --git a/rkward/rbackend/rpackages/rkward/R/ver.R b/rkward/rbackend/rpackages/rkward/R/ver.R
index ed6490b..83e01a7 100644
--- a/rkward/rbackend/rpackages/rkward/R/ver.R
+++ b/rkward/rbackend/rpackages/rkward/R/ver.R
@@ -3,4 +3,4 @@
 # rkward/SetVersionNumber.cmake
 
 #' @export
-".rk.app.version" <- "0.6.4z+0.6.5+devel1"
+".rk.app.version" <- "0.6.5z+0.6.6+devel1"