Fixes test

nim-lang · Jan 17, 2025 · 9428ff0 · 9428ff0
1 parent e9d55c5
commit 9428ff0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/nimble.nim b/src/nimble.nim
@@ -1906,7 +1906,9 @@ proc lock(options: Options) =
   var 
     baseDeps = 
       if options.useSATSolver:
-        processFreeDependenciesSAT(pkgInfo, options, fromLock = true).toSeq        
+        #only if we are actually locking (not upgrading)
+        let fromLock = options.action.typ == actionLock
+        processFreeDependenciesSAT(pkgInfo, options, fromLock).toSeq        
       else:
         pkgInfo.getDependenciesForLocking(options) # Deps shared by base and tasks  
 

diff --git a/tests/tlockfile.nim b/tests/tlockfile.nim
@@ -84,7 +84,7 @@ license       = "MIT"
 requires "nim >= 1.5.1"
 """
     additionalFileContent = "proc foo() =\n  echo \"foo\"\n"
-    alternativeAdditionalFileContent = "proc bar() =\n  echo \"bar\"\n"
+    # alternativeAdditionalFileContent  = "proc bar() =\n  echo \"bar\"\n"
 
   definePackageConstants(PkgIdent.main)
   definePackageConstants(PkgIdent.dep1)
@@ -235,7 +235,7 @@ requires "nim >= 1.5.1"
     result = lockFileName.readFile.parseJson{$lfjkPackages}{dep}{$lfjkPkgVcsRevision}.str
 
   proc addAdditionalFileAndPushToRemote(
-      repoPath, remoteName, remotePath, fileContent: string) =
+      repoPath, remoteName, remotePath, fileContent: string) {.used.} =
     cdNewDir remotePath:
       initRepo(isBare = true)
     cd repoPath: