Update

insightsengineering · Feb 9, 2024 · 7ee9305 · 7ee9305
1 parent 9968fad
commit 7ee9305
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/cmd/renv.go b/cmd/renv.go
@@ -241,20 +241,15 @@ func UpdateRepositoryPackages(renvLock *RenvLock, updatePackageRegexp string,
 		log.Trace("Package ", k, " matches updated packages regexp ",
 			updatePackageRegexp)
 		var repositoryPackagesFile PackagesFile
+		var notFoundRepositoryName string
 		repositoryName := v.Repository
 		repositoryPackagesFile, ok := packagesFiles[repositoryName]
 		if !ok {
 			// Package coming from a repository not defined in the lockfile.
 			// Check which of the defined repositories has the latest version of that package.
-			notFoundRepositoryName := repositoryName
-			repositoryName := GetLatestPackageVersionFromAnyRepository(k, packagesFiles)
+			notFoundRepositoryName = repositoryName
+			repositoryName = GetLatestPackageVersionFromAnyRepository(k, packagesFiles)
 			repositoryPackagesFile = packagesFiles[repositoryName]
-			log.Warn(
-				"Repository ", notFoundRepositoryName, " referenced by package ", k,
-				"has not been defined in the lockfile. Therefore, the package will be updated to ",
-				"the version found in ", repositoryName, " which contains the latest version of this ",
-				"package among the repositories defined in the lockfile.",
-			)
 		}
 		var newPackageVersion string
 		for _, singlePackage := range repositoryPackagesFile.Packages {
@@ -269,6 +264,14 @@ func UpdateRepositoryPackages(renvLock *RenvLock, updatePackageRegexp string,
 		}
 		if entry, ok := renvLock.Packages[k]; ok {
 			if newPackageVersion != entry.Version {
+				if notFoundRepositoryName != "" {
+					log.Warn(
+						"Repository ", notFoundRepositoryName, " referenced by package ", k,
+						"has not been defined in the lockfile. Therefore, the package will be updated to ",
+						"the version found in ", repositoryName, " which contains the latest version of this ",
+						"package among the repositories defined in the lockfile.",
+					)
+				}
 				log.Info("Updating package ", k, " version: ",
 					entry.Version, " → ", newPackageVersion)
 				entry.Version = newPackageVersion

diff --git a/cmd/root.go b/cmd/root.go
@@ -79,7 +79,7 @@ var rootCmd *cobra.Command
 
 func newRootCommand() {
 	rootCmd = &cobra.Command{
-		Use: "locksmith",
+		Use:   "locksmith",
 		Short: "renv.lock generator",
 		Long: `locksmith is a utility to generate renv.lock file containing all dependencies
 of given set of R packages. Given the input list of git repositories containing the R packages,
@@ -154,7 +154,7 @@ in an renv.lock-compatible file.`,
 	rootCmd.AddCommand(extension.NewVersionCobraCmd())
 
 	cfg := envy.CobraConfig{
-		Prefix: "LOCKSMITH",
+		Prefix:     "LOCKSMITH",
 		Persistent: true,
 	}
 	envy.ParseCobra(rootCmd, cfg)