Bugfix for nested directories, silence warnings for hard link failure.

ArtifactDB · Apr 11, 2024 · d2ce920 · d2ce920
1 parent aff6359
commit d2ce920
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: gobbler
-Version: 0.3.0
+Version: 0.3.1
 Date: 2024-04-10
 Title: Interface to the gobbler service
 Description:

diff --git a/R/uploadDirectory.R b/R/uploadDirectory.R
@@ -47,11 +47,11 @@ uploadDirectory <- function(project, asset, version, directory, staging, url, pr
         for (p in list.files(directory, recursive=TRUE)) {
             src <- file.path(directory, p)
             dest <- file.path(new.dir, p)
-            dir.create(dirname(dest), showWarnings=FALSE)
+            dir.create(dirname(dest), recursive=TRUE, showWarnings=FALSE)
 
             src.link <- Sys.readlink(src)
             if (src.link == "" || !startsWith(src, "/")) { # i.e., not a link to an absolute path.
-                if (!file.link(src, dest) && !file.copy(src, dest)) {
+                if (!suppressWarnings(file.link(src, dest)) && !file.copy(src, dest)) {
                     stop("failed to link or copy '", p, "' to the staging directory")
                 }
             } else {