Fix NPE

babashka · Oct 2, 2023 · 5c17113 · 5c17113
1 parent 5fd6ce2
commit 5c17113
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/neil b/neil
@@ -1447,13 +1447,13 @@ details on the search syntax.")))
             v-older? (req-resolve 'version-clj.core/older?)]
         (or
          ;; prefer a more recent stable
-         (let [candidate (or (first (filter stable-version? clojars-candidates))
-                             (first (filter stable-version? maven-candidates)))]
+         (when-let [candidate (or (first (filter stable-version? clojars-candidates))
+                                  (first (filter stable-version? maven-candidates)))]
            (when (v-older? (:mvn/version current) candidate)
              {:mvn/version candidate}))
 
          ;; otherwise, provide a more recent unstable
-         (let [candidate (or (first clojars-candidates) (first maven-candidates))]
+         (when-let [candidate (or (first clojars-candidates) (first maven-candidates))]
            (when (v-older? (:mvn/version current) candidate)
              candidate))
 

diff --git a/src/babashka/neil.clj b/src/babashka/neil.clj
@@ -589,13 +589,13 @@ details on the search syntax.")))
             v-older? (req-resolve 'version-clj.core/older?)]
         (or
          ;; prefer a more recent stable
-         (let [candidate (or (first (filter stable-version? clojars-candidates))
-                             (first (filter stable-version? maven-candidates)))]
+         (when-let [candidate (or (first (filter stable-version? clojars-candidates))
+                                  (first (filter stable-version? maven-candidates)))]
            (when (v-older? (:mvn/version current) candidate)
              {:mvn/version candidate}))
 
          ;; otherwise, provide a more recent unstable
-         (let [candidate (or (first clojars-candidates) (first maven-candidates))]
+         (when-let [candidate (or (first clojars-candidates) (first maven-candidates))]
            (when (v-older? (:mvn/version current) candidate)
              candidate))
 

diff --git a/test/babashka/neil/dep_upgrade_test.clj b/test/babashka/neil/dep_upgrade_test.clj
@@ -245,3 +245,8 @@
       (is (clojure2d-exclusions) "Exclusions are present before upgrading")
       (test-util/neil "dep upgrade" :deps-file test-file-path)
       (is (clojure2d-exclusions) "Exclusions are present after upgrading"))))
+
+(deftest npe-test
+  (is (neil/dep->upgrade {:lib 'com.wsscode/pathom3
+                          :current {:mvn/version "2023.01.31-alpha"}
+                          :unstable true})))