Better error on missing -Sdeps file

Author: puredanger

Diff for: CHANGELOG.md

@@ -3,6 +3,8 @@ Changelog
 
 *Also see [Tools and installer changelog](https://github.com/clojure/brew-install/blob/1.12.0/CHANGELOG.md)*
 
+* next on Mar 5, 2025
+  * Better error on missing -Sdeps file
 * 0.22.1503 on Mar 5, 2025
   * Error on missing -Sdeps file
 * 0.22.1497 on Mar 5, 2025

Diff for: src/main/clojure/clojure/tools/deps/script/make_classpath2.clj

@@ -84,6 +84,8 @@
            skip-cp threads trace tree] :as _opts}]
   (when (and main-aliases exec-aliases)
     (throw (ex-info "-M and -X cannot be used at the same time" {})))
+  (when (and (string? config-data) (not (.exists (jio/file config-data))))
+    (throw (ex-info (str "Extra deps file not found: " config-data) {})))
   (let [combined-exec-aliases (concat main-aliases exec-aliases repl-aliases tool-aliases)
         args (cond-> nil
                threads (assoc :threads (Long/parseLong threads))

Diff for: src/main/clojure/clojure/tools/deps/script/parse.clj

@@ -43,6 +43,4 @@
     (cond
       (s/blank? s) (throw (ex-info (str "-Sdeps must be non-blank") {}))
       (s/starts-with? (s/trim s) "{") (edn/read-string {:default tagged-literal} s)
-      :else (if (.exists (jio/file s))
-              s
-              (throw (ex-info (str "Extra deps file not found: " s) {}))))))
+      :else s)))

Diff for: src/test/clojure/clojure/tools/deps/script/test_parse.clj

@@ -5,5 +5,4 @@
 
 (deftest test-parse-config
   (is (= {:paths ["x"]} (parse/parse-config "{:paths [\"x\"]}")))
-  (is (= "deps.edn" (parse/parse-config "deps.edn")))
-  (is (thrown? clojure.lang.ExceptionInfo (parse/parse-config "BOGUS"))))
+  (is (= "deps.edn" (parse/parse-config "deps.edn"))))