From cf9869653814bc338af20294602f4250a16bb909 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 7 Jun 2018 13:07:38 -0700 Subject: [PATCH] devops: Replace references to deprecated bindings. --- src/devops/devops.scm | 10 +++++----- src/devops/lint.scm | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/devops/devops.scm b/src/devops/devops.scm index ff27b9314..97339893a 100644 --- a/src/devops/devops.scm +++ b/src/devops/devops.scm @@ -751,7 +751,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (if (not (member target '("native" "svm" "C" "C-old" "C2native" "C2svm"))) (error "Unknown build target:" target)) (load-make-config) - (%exit + (exit (call-with-current-continuation ;throw here to unwind all (lambda (abort-job) (bind-condition-handler (list condition-type:error) @@ -760,15 +760,15 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (log "# "(emacs-friendly-timestamp)"\n") (write-condition-report condition (current-output-port)) (newline) - (flush-output) - (abort-job 2)) + (flush-output-port) + (abort-job #f)) (lambda () (with-^G-interrupt-handler (named-lambda (job-^G-interrupt-handler) - (abort-job 3)) + (abort-job #f)) (lambda () (devops:make* target) - 0)))))))) + #t)))))))) (define (devops:make* target) (let* ((prefix (or (get-environment-variable "PWD") diff --git a/src/devops/lint.scm b/src/devops/lint.scm index 548b9bb27..900000ac8 100644 --- a/src/devops/lint.scm +++ b/src/devops/lint.scm @@ -72,8 +72,8 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. deffns)))) (define (pmodel/find-package pmodel package-name) - (find-matching-item (pmodel/packages pmodel) - (lambda (p) (equal? package-name (package/name p))))) + (filter (lambda (p) (equal? package-name (package/name p))) + (pmodel/packages pmodel))) (define (pmodel/global-exports pmodel) (define (global-exports package) -- 2.25.1