From c320714231dd623d367f6beaa6b66bbe66d84eb4 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Mon, 6 Nov 2017 17:55:40 -0700
Subject: [PATCH] devops: Unused variables. Don't report unreleased when
releasing.
---
src/devops/devops.scm | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/devops/devops.scm b/src/devops/devops.scm
index ba8b1ad41..367d24b52 100644
--- a/src/devops/devops.scm
+++ b/src/devops/devops.scm
@@ -124,7 +124,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
'())))
(define (news-version-lint plugin version)
- (let ((nvers (read-news-version plugin version)))
+ (let ((nvers (read-news-version plugin)))
(if nvers
(if (string=? nvers (version-string version))
'()
@@ -132,7 +132,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
(list "NEWS version not found."))))
(define (subsystem-version-lint plugin version)
- (let ((svers (read-subsystem-version plugin version)))
+ (let ((svers (read-subsystem-version plugin)))
(if svers
(if (version=? svers version)
'()
@@ -214,7 +214,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
(group day (+ (char-in numeric)))
(string-end))))
-(define (read-news-version plugin version)
+(define (read-news-version plugin)
(let* ((fullname (string (project-name)"-"(plugin-name plugin)))
(file (string (plugin-directory plugin)"/NEWS")))
(and (file-exists? file)
@@ -230,7 +230,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
(match-extract match 'version)
(loop))))))))))))
-(define (make-subsystem-pattern plugin)
+(define subsystem-pattern
(compile-regsexp
'(seq "(add-subsystem-identification!"
" \""(+ (char-not-in #\"))"\""
@@ -239,23 +239,22 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
")"))
")")))
-(define (read-subsystem-version plugin version)
- (let* ((fullname (string (project-name)"-"(plugin-name plugin)))
- (file (find-plugin-make.scm plugin)))
+(define (read-subsystem-version plugin)
+ (let ((file (find-plugin-make.scm plugin)))
(and file
- (let ((pattern (make-subsystem-pattern plugin)))
- (call-with-input-file file
- (lambda (in)
- (let loop ()
- (let ((line (read-line in)))
- (if (eof-object? line)
- #f
- (let ((match (regsexp-match-string pattern line)))
- (if match
- (call-with-input-string
- (match-extract match 'version)
- read)
- (loop))))))))))))
+ (call-with-input-file file
+ (lambda (in)
+ (let loop ()
+ (let ((line (read-line in)))
+ (if (eof-object? line)
+ #f
+ (let ((match
+ (regsexp-match-string subsystem-pattern line)))
+ (if match
+ (call-with-input-string
+ (match-extract match 'version)
+ read)
+ (loop)))))))))))
(define (find-plugin-make.scm plugin)
(or (let ((file (string (plugin-directory plugin)"/make.scm")))
@@ -408,7 +407,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
(logfile (string "devops/"pkgvers"-src.log"))
(dir (plugin-directory plugin)))
(log "# "pkgvers":\n")
- (write-lint (plugin-lint plugin version changes dirt))
+ (write-lint (plugin-lint plugin version '() dirt))
(with-output-log
logfile
(lambda ()
--
2.25.1