[ARVADOS] updated: 1.1.2-113-gb0f36fd
Git user
git at public.curoverse.com
Fri Jan 12 06:11:43 EST 2018
Summary of changes:
sdk/R/R/Arvados.R | 4 ++--
sdk/R/R/CollectionTree.R | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
via b0f36fd28ee29321d368852bd14b61485e758af3 (commit)
from 7f2de2ec1d52c8e5984b610c5930f2d9629bd357 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b0f36fd28ee29321d368852bd14b61485e758af3
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date: Fri Jan 12 12:06:04 2018 +0100
collection$get("file") and collection$get("./file") now return the same file
Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>
diff --git a/sdk/R/R/Arvados.R b/sdk/R/R/Arvados.R
index d7f52e2..5515bfd 100644
--- a/sdk/R/R/Arvados.R
+++ b/sdk/R/R/Arvados.R
@@ -18,7 +18,7 @@ Arvados <- R6::R6Class(
initialize = function(auth_token = NULL, host_name = NULL)
{
if(!is.null(host_name))
- Sys.setenv(ARVADOS_API_HOST = host_name)
+ Sys.setenv(ARVADOS_API_HOST = host_name)
if(!is.null(auth_token))
Sys.setenv(ARVADOS_API_TOKEN = auth_token)
@@ -29,7 +29,7 @@ Arvados <- R6::R6Class(
if(host_name == "" | token == "")
stop(paste0("Please provide host name and authentification token",
" or set ARVADOS_API_HOST and ARVADOS_API_TOKEN",
- " environmental variables."))
+ " environment variables."))
version <- "v1"
host <- paste0("https://", host_name, "/arvados/", version, "/")
diff --git a/sdk/R/R/CollectionTree.R b/sdk/R/R/CollectionTree.R
index e024f5e..b95b797 100644
--- a/sdk/R/R/CollectionTree.R
+++ b/sdk/R/R/CollectionTree.R
@@ -37,6 +37,9 @@ CollectionTree <- R6::R6Class(
getElement = function(relativePath)
{
+ if(startsWith(relativePath, "./"))
+ relativePath <- substr(relativePath, 3, nchar(relativePath))
+
if(endsWith(relativePath, "/"))
relativePath <- substr(relativePath, 0, nchar(relativePath) - 1)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list