Skip to content

Commit 562c798

Browse files
committed
Don't require checksums for signature files
Fixes #859.
1 parent 2d80037 commit 562c798

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/clojars/file_utils.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
([file type]
3838
(valid-checksum-file? file type true))
3939
([file type fail-if-missing?]
40-
(let [sig-file (checksum-file file type)]
41-
(if (.exists sig-file)
42-
(valid-checksum? (slurp sig-file) file type)
40+
(let [sum-file (checksum-file file type)]
41+
(if (.exists sum-file)
42+
(valid-checksum? (slurp sum-file) file type)
4343
(not fail-if-missing?)))))
4444

4545
(defn group->path [group]

src/clojars/routes/repo.clj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,11 @@
258258
(defn validate-checksums [artifacts]
259259
(doseq [f artifacts]
260260
;; verify that at least one type of checksum file exists
261-
(when (not (or (.exists (fu/checksum-file f :md5))
262-
(.exists (fu/checksum-file f :sha1))))
261+
(when (and (not (or (.exists (fu/checksum-file f :md5))
262+
(.exists (fu/checksum-file f :sha1))))
263+
;; Aether by default no longer checksums signature files, so we don't
264+
;; throw if it is missing
265+
(not (match-file-name #"\.asc$" f)))
263266
(throw-invalid :file-missing-checksum
264267
(format "no checksums provided for %s" (.getName f))
265268
{:file f}))

0 commit comments

Comments
 (0)