diff options
author | Alex Kost <alezost@gmail.com> | 2016-02-12 12:32:34 +0300 |
---|---|---|
committer | Alex Kost <alezost@gmail.com> | 2016-02-22 22:36:35 +0300 |
commit | 260795b7369c51d99c7ab4f3ef24f195938beabf (patch) | |
tree | bbbbfb3d622f044fb3c37284d0581e086e08935b /emacs | |
parent | 0338132e655553358035f61df7e96f5cfac5378a (diff) | |
download | gnu-guix-260795b7369c51d99c7ab4f3ef24f195938beabf.tar gnu-guix-260795b7369c51d99c7ab4f3ef24f195938beabf.tar.gz |
emacs: Do not allow a user to modify system profiles.
Fixes <http://bugs.gnu.org/22607>.
Reported by myglc2 <myglc2@gmail.com>.
Remove possibilities to install/delete packages to/from a system profile
both for "Package List" and "Package Info" buffers.
* emacs/guix-profiles.el (guix-system-profile-regexp): New variable.
(guix-system-profile?): New procedure.
* emacs/guix-ui-package.el (guix-package-info-insert-output): Do not
display "Install"/"Delete" button for a system profile.
(guix-package-assert-non-system-profile): New procedure.
(guix-package-execute-actions): Use it.
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/guix-profiles.el | 8 | ||||
-rw-r--r-- | emacs/guix-ui-package.el | 27 |
2 files changed, 30 insertions, 5 deletions
diff --git a/emacs/guix-profiles.el b/emacs/guix-profiles.el index 43ad1d42eb..12cf46dbf8 100644 --- a/emacs/guix-profiles.el +++ b/emacs/guix-profiles.el @@ -40,6 +40,14 @@ (defvar guix-current-profile guix-default-profile "Current profile.") +(defvar guix-system-profile-regexp + (concat "\\`" (regexp-quote guix-system-profile)) + "Regexp matching system profiles.") + +(defun guix-system-profile? (profile) + "Return non-nil, if PROFILE is a system one." + (string-match-p guix-system-profile-regexp profile)) + (defun guix-profile-prompt (&optional default) "Prompt for profile and return it. Use DEFAULT as a start directory. If it is nil, use diff --git a/emacs/guix-ui-package.el b/emacs/guix-ui-package.el index 78d2c40848..d6d26335fa 100644 --- a/emacs/guix-ui-package.el +++ b/emacs/guix-ui-package.el @@ -454,17 +454,22 @@ current OUTPUT is installed (if there is such output in (string= (guix-entry-value entry 'output) output)) installed)) - (action-type (if installed-entry 'delete 'install))) + (action-type (if installed-entry 'delete 'install)) + (profile (guix-ui-current-profile))) (guix-info-insert-indent) (guix-format-insert output (if installed-entry 'guix-package-info-installed-outputs 'guix-package-info-uninstalled-outputs) guix-package-info-output-format) - (guix-package-info-insert-action-button action-type entry output) - (when obsolete - (guix-info-insert-indent) - (guix-package-info-insert-action-button 'upgrade entry output)) + ;; Do not allow a user to install/delete anything to/from a system + ;; profile, so add action buttons only for non-system profiles. + (when (and profile + (not (guix-system-profile? profile))) + (guix-package-info-insert-action-button action-type entry output) + (when obsolete + (guix-info-insert-indent) + (guix-package-info-insert-action-button 'upgrade entry output))) (insert "\n") (when installed-entry (guix-info-insert-entry installed-entry 'installed-output 2)))) @@ -723,10 +728,22 @@ take an entry as argument." 'upgrade nil (guix-package-installed-outputs entry))))) +(defun guix-package-assert-non-system-profile () + "Verify that the current profile is not a system one. +The current profile is the one used by the current buffer." + (let ((profile (guix-ui-current-profile))) + (and profile + (guix-system-profile? profile) + (user-error "Packages cannot be installed or removed to/from \ +profile '%s'. +Use 'guix system reconfigure' shell command to modify a system profile." + profile)))) + (defun guix-package-execute-actions (fun) "Perform actions on the marked packages. Use FUN to define actions suitable for `guix-process-package-actions'. FUN should take action-type as argument." + (guix-package-assert-non-system-profile) (let ((actions (delq nil (mapcar fun '(install delete upgrade))))) (if actions |