From 130312cb2eb3f938fbf4bf552867dae048275342 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 18 Mar 2020 11:58:50 -0400
Subject: Move package check to the end (again)

---
 src/resolve.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/resolve.c')

diff --git a/src/resolve.c b/src/resolve.c
index bed9c60..1a4448f 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -42,11 +42,6 @@ ManifestPackage **resolve_dependencies(ManifestList *manifests, const char *spec
         return requirements;
     }
 
-    if (!resolve_has_dependency(package->archive)) {
-        requirements[req_i] = package;
-        req_i++;
-    }
-
     for (size_t i = 0; i < package->requirements_records && i < SPM_REQUIREMENT_MAX; i++) {
         requirement = manifestlist_search(manifests, package->requirements[i]);
         if (requirement == NULL) {
@@ -60,5 +55,11 @@ ManifestPackage **resolve_dependencies(ManifestList *manifests, const char *spec
             requirements[req_i] = requirement;
         }
     }
+
+    if (!resolve_has_dependency(package->archive)) {
+        requirements[req_i] = package;
+        req_i++;
+    }
+
     return requirements;
 }
\ No newline at end of file
-- 
cgit