branch: externals/system-packages
commit d1a680ed6726f167b256c292dc87edb5a6181322
Author: Stefan Kangas <[email protected]>
Commit: Stefan Kangas <[email protected]>
Don't consider /usr/games/pacman a package manager
* system-packages.el (system-packages-package-manager): Don't try to
use /usr/games/pacman.
Ref: https://github.com/jwiegley/use-package/issues/1060
---
system-packages.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/system-packages.el b/system-packages.el
index 10a87de16c..b239decadb 100644
--- a/system-packages.el
+++ b/system-packages.el
@@ -313,9 +313,13 @@ to the command.")
(while managers
(progn
(setq manager (pop managers))
- (if (executable-find (symbol-name (car manager)))
- (setq managers nil)
- (setq manager nil))))
+ (let ((found (executable-find (symbol-name (car manager)))))
+ (if (and found
+ ;; The package manager named "pacman" conflicts
+ ;; with the game binary on non-Arch systems.
+ (not (string-match (rx "games/pacman" eos) found)))
+ (setq managers nil)
+ (setq manager nil)))))
(car manager))
"Symbol naming the package manager to use.
See `system-packages-supported-package-managers' for the list of
