From 0d2cec77220ec4339261b7b566fe4cd27e3d49c9 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 6 Nov 2017 16:51:24 -0700 Subject: [PATCH] devops: List uncommitted and unreleased last. Mention problem file name when "subsystem" version does not match. --- src/devops/devops.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/devops/devops.scm b/src/devops/devops.scm index 7ac58bc77..ba8b1ad41 100644 --- a/src/devops/devops.scm +++ b/src/devops/devops.scm @@ -70,28 +70,28 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (define (core-lint version changes dirt) (let ((dirt (core-dirt dirt))) (append - (changes-lint changes) - (dirt-lint dirt) (debian-version-lint version (debian-version ".")) (released-version-lint version (released-version (project-name)) changes) (if core-lint-hook (core-lint-hook version changes dirt) - '())))) + '()) + (dirt-lint dirt) + (changes-lint changes)))) (define (plugin-lint plugin version changes dirt) (let ((pdirt (plugin-dirt plugin dirt)) (pkg (plugin-package plugin)) (dir (plugin-directory plugin))) (append - (changes-lint changes) - (dirt-lint pdirt) (debian-version-lint version (debian-version dir)) (news-version-lint plugin version) (subsystem-version-lint plugin version) (released-version-lint version (released-version pkg) changes) (if plugin-lint-hook (plugin-lint-hook plugin version changes dirt) - '())))) + '()) + (dirt-lint pdirt) + (changes-lint changes)))) (define debian-changelog-version-pattern (compile-regsexp '(seq (* (any-char)) @@ -125,23 +125,21 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (define (news-version-lint plugin version) (let ((nvers (read-news-version plugin version))) - (append - (if (not nvers) - (list "NEWS version not found.") - '()) - (if (and nvers (not (string=? nvers (version-string version)))) - (list (string "NEWS version ("nvers") does not match.")) - '())))) + (if nvers + (if (string=? nvers (version-string version)) + '() + (list (string "NEWS version ("nvers") does not match."))) + (list "NEWS version not found.")))) (define (subsystem-version-lint plugin version) (let ((svers (read-subsystem-version plugin version))) - (append - (if (not svers) - (list "Subsystem version not found.") - '()) - (if (and svers (not (version=? svers version))) - (list (string "Subsystem version "svers" does not match.")) - '())))) + (if svers + (if (version=? svers version) + '() + (list (string "Subsystem version "svers" does not match.") + (string " (See "(plugin-directory plugin)"/make.scm.)"))) + (list "Subsystem version not found." + (string " (See "(plugin-directory plugin)"/make.scm.)"))))) (define (released-version-lint version released changes) (cond ((eq? #f released) -- 2.25.1