Bug correction in update_pkg()

learnitr · Feb 8, 2021 · d67737f · d67737f
1 parent 9b5a486
commit d67737f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: learndown
 Type: Package
-Version: 1.2.0
+Version: 1.2.1
 Title: 'SciViews' - R Markdown and Bookdown Additions for Learning Material
 Description: Extension to R Markdown and Bookdown for building better learning
   and e-learning material: H5P integration, course-contextual divs, different

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# learndown 1.2.1
+
+- Bug correction: when update_pkg() encountered a more recent version of the package, it upgraded it anyway.
+
 # learndown 1.2.0
 
 - There are now more GitHub assignation types : `assign2()` for group assignations and `challenge()`/`challenge2()` for assignations linked to challenges (individual or in groups).

diff --git a/R/run.R b/R/run.R
@@ -181,7 +181,7 @@ update_pkg <- function(package, github_repos, upgrade = "never") {
     if (is.null(token)) {
       NULL
     } else {
-      authenticate(token, "x-oauth-basic", "basic")
+      httr::authenticate(token, "x-oauth-basic", "basic")
     }
   }
 
@@ -244,7 +244,7 @@ update_pkg <- function(package, github_repos, upgrade = "never") {
     last_rel <- sub("^[vV]([0-9]+\\.[0-9]+)\\.([0-9]+)$", "\\1-\\2", last_tag)
     curr_rel <- sub("^([0-9]+\\.[0-9]+)\\.([0-9]+)$", "\\1-\\2",
       packageVersion(package))
-    status <- try(compareVersion(last_rel, curr_rel) != 0, silent = TRUE)
+    status <- try(compareVersion(last_rel, curr_rel), silent = TRUE)
     if (!inherits(status, "try-error")) {
       if (status > 0) {
         # We need to update the package