moved stop aroudn to fail quicker

muschellij2 · Jan 21, 2021 · e4c7b7e · e4c7b7e
1 parent 8c9e8b8
commit e4c7b7e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/R/remote_package_dcf.R b/R/remote_package_dcf.R
@@ -35,6 +35,11 @@ get_remote_package_dcf = function(
 
   tmp <- tempfile()
   api_call = grepl("api", tolower(url))
+  if (api_call) {
+    if (!requireNamespace("base64enc", quietly = TRUE)) {
+      stop("base64enc needed for API calls")
+    }
+  }
   if (!api_call) {
     path <- paste(c(
       remote$username,
@@ -67,15 +72,15 @@ get_remote_package_dcf = function(
     }
   } else {
     if (api_call) {
-      if (!requireNamespace("base64enc", quietly = TRUE)) {
-        stop("base64enc needed for API calls")
-      }
       data = httr::content(req)$content
       data = base64enc::base64decode(what = data)
       data = rawToChar(data)
       writeLines(data, tmp)
     }
   }
+  if (is.na(tmp)) {
+    warning("Request to GitHub API did not result in a DCF file download")
+  }
   names(tmp) = remotes
   return(tmp)
 }