Commit 206d4b24 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Have run-shell-command actually return an exit code, like it used to.

Also, remove some extraneous comments from run-program.
parent 8f34937b
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -133,7 +133,15 @@ Deprecated function, for backward-compatibility only.
Please use UIOP:RUN-PROGRAM instead."
    (let ((command (apply 'format nil control-string args)))
      (asdf-message "; $ ~A~%" command)
      (run-program command :force-shell t :ignore-error-status t :output *verbose-out*))))
      (handler-case
          (progn
            (run-program command :force-shell t :ignore-error-status nil :output *verbose-out*)
            0)
        (subprocess-error (c)
          (let ((code (subprocess-error-code c)))
            (typecase code
              (integer code)
              (t 255))))))))

(with-upgradability ()
  (defvar *asdf-verbose* nil)) ;; backward-compatibility with ASDF2 only. Unused.
+0 −2
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ ELEMENT-TYPE and EXTERNAL-FORMAT for the stream passed to the OUTPUT processor."
             (redirected-system-command (command out)
               (format nil (if (os-unix-p) "exec > ~*~A ; ~2:*~A" "~A > ~A")
                       (system-command command) (native-namestring out)))
             ;; this is only called if :OUTPUT is NIL or :INTERACTIVE
             (system (command &key interactive)
               (declare (ignorable interactive))
               #+(or abcl xcl) (ext:run-shell-command command)
@@ -430,7 +429,6 @@ ELEMENT-TYPE and EXTERNAL-FORMAT for the stream passed to the OUTPUT processor."
                                               :element-type element-type
                                               #-gcl2.6 :external-format #-gcl2.6 external-format)
                         (slurp-input-stream output stream)))
                     ;; OUTPUT is either NIL (discard) or :INTERACTIVE
                     (call-system (system-command command) :interactive interactive)))))
      (if (and (not force-shell)
               #+(or clisp ecl) ignore-error-status