Commit 8772c1a3 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Tweak debian package code

parent 4ab58fb3
......@@ -48,4 +48,4 @@
(deftestcmd git-all-committed-p ()
"is your checkout clean, with all files committed?"
(null (nth-value 1 (git '(status -s) :output :lines))))
(null (nth-value 2 (git '(status -s) :output :lines))))
......@@ -192,7 +192,7 @@
(unless (equal new-version (parse-debian-version debian-version))
(error "You're trying to release version ~A but the debian/changelog wasn't properly updated"
new-version)))
(when (nth-value 1 (run '(parse-changelog debian/changelog) :output nil :error-output :lines))
(when (nth-value 1 (run '(dpkg-parsechangelog) :output nil :error-output :lines))
(error "Malformed debian/changelog entry")))
scripts ;; TODO: needs to be passed as argument!
(and ;; need a better combinator, that tells us about progress, etc.
......
......@@ -6,17 +6,18 @@
(defun version-from-tag (&optional commit)
;; run-program issue: :output :line closes the fd, which causes the program to die in error.
(first (nth-value 1 (git `(describe --tags --match ,*version-tag-glob* ,commit) :output :lines))))
(first (nth-value 2 (git `(describe --tags --match ,*version-tag-glob* ,commit) :output :lines))))
(defun version-from-file (&optional commit)
(if commit
(nth-value 1 (git `(show (,commit":version.lisp-expr")) :output :form))
(nth-value 2 (git `(show (,commit":version.lisp-expr")) :output :form))
(safe-read-file-form (pn "version.lisp-expr"))))
(defun debian-version-from-file (&optional commit)
(match (if commit
;; run-program issue: :output :line closes the fd, which causes the program to die in error.
(first (nth-value 1 (git `(show (,commit":debian/changelog")) :output :lines)))
(first (nth-value 2 (git `(show (,commit":debian/changelog"))
:output :lines :error-output nil)))
(read-file-line (pn "debian/changelog")))
((ppcre "^[^(]*\\(([-0-9.:-]+)\\)" ver) ver)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment