tweaks

rstudio · Dec 18, 2024 · eb3e6df · eb3e6df
1 parent fcfb00f
commit eb3e6df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/R/hash.R b/R/hash.R
@@ -10,10 +10,10 @@ renv_hash_fields <- function(dcf) {
   )
 }
 
-renv_hash_fields_default <- function(dcf) {
+renv_hash_fields_default <- function() {
   c(
-    "Package", "Version",
-    "Title", "Author", "Maintainer", "Description",
+    "Package", "Version", "Title",
+    "Author", "Maintainer", "Description",
     "Depends", "Imports", "Suggests", "LinkingTo"
   )
 }

diff --git a/R/snapshot.R b/R/snapshot.R
@@ -744,7 +744,7 @@ renv_snapshot_description_impl <- function(dcf, path = NULL) {
   # drop fields that normally only appear in binary packages,
   # or fields which might differ from user to user, or might
   # differ depending on the mirror used for publication
-  ignore <- c("Packaged", "Date/Publication", "Built")
+  ignore <- c("Archs", "Built", "Date/Publication", "File", "MD5sum", "Packaged")
   dcf[ignore] <- NULL
 
   # drop remote fields for cranlike remotes
@@ -756,6 +756,10 @@ renv_snapshot_description_impl <- function(dcf, path = NULL) {
     }
   }
 
+  # drop the old Github remote fields
+  github <- grepl("^Github", names(dcf), perl = TRUE)
+  dcf <- dcf[!github]
+
   # generate a hash if we can
   dcf[["Hash"]] <- if (the$auto_snapshot_hash) {
     if (is.null(path))