Can sync ignoring deps not present in lock file even if they are in d…

…evelop file
yyoncho · Jul 19, 2022 · aef6f4f · aef6f4f
1 parent 25d6e4a
commit aef6f4f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/nimble.nim b/src/nimble.nim
@@ -1761,7 +1761,9 @@ proc sync(options: Options) =
   findValidationErrorsOfDevDepsWithLockFile(pkgInfo, options, errors)
 
   for name, error in common.dup(errors):
-    if error.kind == vekWorkingCopyNeedsSync:
+    if not pkgInfo.lockedDeps.contains(name):
+      errors.del name
+    elif error.kind == vekWorkingCopyNeedsSync:
       if not options.action.listOnly:
         syncWorkingCopy(name, error.path, pkgInfo, options)
       else:

diff --git a/tests/tlockfile.nim b/tests/tlockfile.nim
@@ -551,3 +551,15 @@ requires "nim >= 1.5.1"
         writeDevelopFile(developFileName, @[],
                          @[dep2PkgRepoPath, mainPkgRepoPath, dep1PkgRepoPath])
         testLockFile(@[(dep1PkgName, dep1PkgRepoPath)], isNew = true)
+
+  test "can sync ignoring deps not present in lock file even if they are in develop file":
+    cleanUp()
+    withPkgListFile:
+      initNewNimblePackage(mainPkgOriginRepoPath, mainPkgRepoPath,
+                           @[dep1PkgName])
+      initNewNimblePackage(dep1PkgOriginRepoPath, dep1PkgRepoPath)
+      cd mainPkgRepoPath:
+        testLockFile(@[(dep1PkgName, dep1PkgRepoPath)], isNew = true)
+        writeDevelopFile(developFileName, @[], @[dep1PkgRepoPath, mainPkgOriginRepoPath])
+        let (_, exitCode) = execNimbleYes("--debug", "--verbose", "sync")
+        check exitCode == QuitSuccess