[ARVADOS] updated: 1.1.1-316-ge72f801

Git user git at public.curoverse.com
Wed Dec 20 04:25:53 EST 2017


Summary of changes:
 build/run-build-packages.sh | 12 ++++++------
 sdk/R/R/Subcollection.R     |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

       via  e72f801012e68e7a223a64d4e90bfa2cc66a9254 (commit)
       via  074f020c32c55c017433ac5a294a5e0b73b360ad (commit)
       via  71940143887b6b97ca358cef5a815d0f7a848f49 (commit)
       via  787eb1c4f4202b8e43ebe11813c737dc16b733d1 (commit)
      from  2fcdd3f845647243517af895d49c812f9c2eaae2 (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 e72f801012e68e7a223a64d4e90bfa2cc66a9254
Merge: 074f020 7194014
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Dec 20 10:25:34 2017 +0100

    Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>


commit 074f020c32c55c017433ac5a294a5e0b73b360ad
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Dec 20 10:24:27 2017 +0100

    Users are no longer able to delete root folder.
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/R/Subcollection.R b/sdk/R/R/Subcollection.R
index 78cc4c1..a1fba1a 100644
--- a/sdk/R/R/Subcollection.R
+++ b/sdk/R/R/Subcollection.R
@@ -45,16 +45,17 @@ Subcollection <- R6::R6Class(
             if(is.null(private$collection))
                 stop("Subcollection doesn't belong to any collection.")
 
+            if(self$name == "")
+                stop("Unable to delete root folder.")
+
             collectionList <- paste0(self$getRelativePath(), "/", self$getFileList(fullpath = FALSE))
             sapply(collectionList, function(file)
             {
                 private$collection$.__enclos_env__$private$deleteFromREST(file)
             })
 
-            #todo rename this add to a collection
             private$addToCollection(NULL)
             private$dettachFromParent()
-
         },
 
         getFileList = function(fullpath = TRUE)

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list