Skip to content

Commit

Permalink
Merge pull request #148 from fktpp2022/main
Browse files Browse the repository at this point in the history
Prevent echo interference
  • Loading branch information
necaris authored Jun 20, 2023
2 parents f3ea387 + 23aa073 commit 6a6a27d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions conda.el
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ Set for the lifetime of the process.")
"Update the environment from PARAMS."
(let ((exports (or (conda-env-params-vars-export params) '())))
(mapc (lambda (pair)
(message "About to set %s to %s" (car pair) (cdr pair))
(let ((inhibit-message t))
(message "About to set %s to %s" (car pair) (cdr pair)))
(setenv (format "%s" (car pair)) (format "%s" (cdr pair))))
exports)))

Expand Down Expand Up @@ -497,7 +498,8 @@ Returns a list of new path elements."
;; others know how to work on this
(pythonic-activate env-dir)
(setq python-shell-virtualenv-root env-dir)
(let ((params (conda--get-activation-parameters env-dir)))
(let ((params (conda--get-activation-parameters env-dir))
(inhibit-message t))
(if (not (eq nil (conda-env-params-vars-export params)))
(conda--update-env-from-params params)
(progn ;; otherwise we fall back to legacy heuristics
Expand Down

0 comments on commit 6a6a27d

Please sign in to comment.