Skip to content

Commit

Permalink
Fix mistaken uses of non-side-effecting when.
Browse files Browse the repository at this point in the history
  • Loading branch information
technomancy committed Nov 17, 2019
1 parent 88fad0e commit 3f68a76
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/leiningen/deploy.clj
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
[version f]
(let [pattern (re-pattern (format "%s-(\\p{Alnum}*)\\.%s" version (extension f)))
[_ classifier-of] (re-find pattern f)]
(when-not (empty? classifier-of)
(if-not (empty? classifier-of)
classifier-of)))

(defn- fail-on-empty-project [project]
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/jar.clj
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@

(defn- get-jar-filename*
[project uberjar?]
(get-classified-jar-filename project (when uberjar? :standalone)))
(get-classified-jar-filename project (if uberjar? :standalone)))

(defn get-jar-filename [project & [uberjar?]]
(get-jar-filename* (preprocess-project project) uberjar?))
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/vcs.clj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
tag (if prefix
(str prefix version)
version)
cmd (->> ["git" "tag" (when sign? "--sign") tag (when annotate? "-a") "-m" (str "Release " version)]
cmd (->> ["git" "tag" (if sign? "--sign") tag (if annotate? "-a") "-m" (str "Release " version)]
(filter some?))]
(apply eval/sh-with-exit-code "Couldn't tag" cmd))))

Expand Down

0 comments on commit 3f68a76

Please sign in to comment.