Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Recognize verbose option in timeout returns.

  • Loading branch information...
commit c94107060d2e03bc6212fff2884d509cdf8f73ca 1 parent 6913db1
@Raynes authored
Showing with 6 additions and 4 deletions.
  1. +6 −4 src/conch/sh.clj
10 src/conch/sh.clj
@@ -42,7 +42,7 @@
(defn run-command [name args options]
(let [proc (apply conch/proc name (add-proc-args args options))
- {:keys [buffer out in err timeout]} options]
+ {:keys [buffer out in err timeout verbose]} options]
(when in (conch/feed-from-string proc (:in proc)))
(when out (callback out buffer :out proc))
(when err (callback err buffer :err proc))
@@ -50,11 +50,13 @@
(conch/exit-code proc timeout)
(conch/exit-code proc))]
(if (= :timeout exit-code)
- {:proc proc
- :exit-code :timeout}
+ (if verbose
+ {:proc proc
+ :exit-code :timeout}
+ :timeout)
(let [proc-out (when-not out (output proc :out options))
proc-err (when-not err (output proc :err options))]
- (if (:verbose options)
+ (if verbose
{:proc proc
:exit-code exit-code
:stdout proc-out
Please sign in to comment.
Something went wrong with that request. Please try again.