summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-11-25 13:25:00 +0300
committerAlex Kost <alezost@gmail.com>2015-12-06 12:46:10 +0300
commit957b73382b31622943db3d066dfedd706b6f19c4 (patch)
tree42c3e14bd72193f263124d600fa709693b4932ea /emacs
parente2e3600fe8a189d820f097e231f4099a850315b1 (diff)
downloadpatches-957b73382b31622943db3d066dfedd706b6f19c4.tar
patches-957b73382b31622943db3d066dfedd706b6f19c4.tar.gz
emacs: Fix 'guix-apply-manifest'.
* emacs/guix-base.el (guix-apply-manifest): Use 'guix-command' instead of 'guix-package' to prevent REPL exit if 'leave' happens. Expand profile and manifest file names, as relative file names lead to an error.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-base.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/emacs/guix-base.el b/emacs/guix-base.el
index 14ea3d4458..a2bd5bf7f2 100644
--- a/emacs/guix-base.el
+++ b/emacs/guix-base.el
@@ -1087,9 +1087,10 @@ FILE. With a prefix argument, also prompt for PROFILE."
file profile)))
(guix-eval-in-repl
(guix-make-guile-expression
- 'guix-package
- (concat "--profile=" profile)
- (concat "--manifest=" file))
+ 'guix-command
+ "package"
+ (concat "--profile=" (expand-file-name profile))
+ (concat "--manifest=" (expand-file-name file)))
operation-buffer)))