Skip to content

Commit

Permalink
Merge pull request #133 from necaris/fix/error-handling-in-conda-resp…
Browse files Browse the repository at this point in the history
…onse

Add error handling if Conda's response is not expected
  • Loading branch information
necaris authored Aug 30, 2022
2 parents e7f7e72 + c5f1761 commit cb9544e
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions conda.el
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,14 @@ ANACONDA_HOME environment variable."
"Return currently installed Conda version. Cached for the lifetime of the process."
(if (not (eq conda--installed-version nil))
conda--installed-version
(s-with (shell-command-to-string (format "%s -V" (conda--get-executable-path)))
(s-trim)
(s-split " ")
(cadr)
(setq conda--installed-version))))
(let ((version-output (shell-command-to-string (format "%s -V" (conda--get-executable-path)))))
(condition-case err
(s-with version-output
(s-trim)
(s-split " ")
(cadr)
(setq conda--installed-version))
(error "Could not parse Conda version: %s (output was %s)" err version-output)))))

(defun conda--supports-json-activator ()
"Does the installed Conda version support JSON activation? See https://github.com/conda/conda/blob/master/CHANGELOG.md#484-2020-08-06."
Expand All @@ -164,9 +167,12 @@ ANACONDA_HOME environment variable."
(with-current-buffer
standard-output
(apply #'process-file process-file-args)))))
(if (version< emacs-version "27.1")
(json-read-from-string output)
(json-parse-string output :object-type 'alist :null-object nil))))
(condition-case err
(if (version< emacs-version "27.1")
(json-read-from-string output)
(json-parse-string output :object-type 'alist :null-object nil))
(error "Could not parse %s as JSON: %s" output err))))


(defvar conda--config nil
"Cached copy of configuration that Conda sees (including `condarc', etc).
Expand Down

0 comments on commit cb9544e

Please sign in to comment.