Commit 7f6e414d31b0dca6f7d12a041d88405134cce328
2019-10-26T17:50:58
add better support for package flavors on OpenBSD
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
diff --git a/test.lisp b/test.lisp
index 2a36cb1..71ec163 100644
--- a/test.lisp
+++ b/test.lisp
@@ -34,7 +34,7 @@
(resource 'host "ams.kmx.io"
:user "root"
:hostname "ams"
- :packages '("emacs" "git" "rsync" "sbcl" "texlive_texmf-full")
+ :packages '("emacs:no_x11" "git" "rsync" "sbcl" "texinfo" "texlive_texmf-full")
(resource 'group "dx"
:gid 19256)
(resource 'user "dx"
@@ -48,7 +48,7 @@
(resource 'host "vu.kmx.io"
:user "root"
:hostname "vu"
- :packages '("emacs" "git" "rsync" "sbcl" "texlive_texmf-full")
+ :packages '("emacs:no_x11" "git" "rsync" "sbcl" "texinfo" "texlive_texmf-full")
(resource 'group "dx"
:gid 19256)
(resource 'user "dx"
diff --git a/unix/openbsd.lisp b/unix/openbsd.lisp
index 33d19b3..d420a7b 100644
--- a/unix/openbsd.lisp
+++ b/unix/openbsd.lisp
@@ -27,22 +27,27 @@
()
((probe-openbsd-pkg :properties (:ensure :flavor :version))))
-(define-syntax pkg_info<1> (name version flavor)
- #~|\s*([^-\s]+(?:-[^-0-9\s][^-\s]+)*)-([0-9][^-\s]*)(?:-([^-\s]+))?|
- "Syntax for pkg_info(1) on OpenBSD")
+(define-syntax pkg_info<1> (name version flavor installed)
+ #~|\s*([^-\s]+(?:-[^-0-9\s][^-\s]+)*)-([0-9][^-\s]*)(?:-([^-\s]+))?( \(installed\))?|
+ "Syntax for pkg_info(1) on OpenBSD"
+ (values name version flavor (and installed t)))
(defgeneric probe-openbsd-pkg (resource os))
(defmethod probe-openbsd-pkg ((pkg openbsd-pkg) (os os-openbsd))
(let ((id (resource-id pkg))
(ensure :absent))
- (multiple-value-bind (version flavor)
- (with-pkg_info<1> (name version flavor)
- (run "pkg_info | egrep " (sh-quote (str "^" id "-")))
- (when (string= id name)
- (setf ensure :installed)
- (return (values version flavor))))
- (properties* ensure version flavor))))
+ (re-bind #~|^([^:]+)(?::(.+)$)?| (id-name id-flavor) id
+ (multiple-value-bind (version flavor)
+ (with-pkg_info<1> (name version flavor installed)
+ (run "pkg_info -Q " (sh-quote id-name))
+ (when (and (string= id-name name)
+ (or (null id-flavor)
+ (string= id-flavor flavor)))
+ (when installed
+ (setf ensure :installed))
+ (return (values version flavor))))
+ (properties* ensure version flavor)))))
(defmethod merge-property-values ((pkg openbsd-pkg)
(property (eql :versions))
@@ -56,6 +61,8 @@
(let ((packages))
(with-pkg_info<1> (name version flavor) (run "pkg_info")
(when (and name version)
+ (when flavor
+ (setq name (str name #\: flavor)))
(let ((pkg (resource 'openbsd-pkg name)))
(add-probed-properties pkg (properties* name version flavor))
(push pkg packages))))
@@ -68,7 +75,10 @@
(describe-probed (resource 'openbsd-pkg "emacs"))
#+nil
-(probe-installed-packages)
+(probe-host-packages *host* (host-os *host*))
+
+#+nil
+(probe *host* :packages)
#+nil
(map nil #'describe-probed (probe-installed-packages))