devops: Replace references to deprecated bindings.
authorMatt Birkholz <matt@birchwood-abbey.net>
Thu, 7 Jun 2018 20:07:38 +0000 (13:07 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Thu, 7 Jun 2018 20:07:38 +0000 (13:07 -0700)
src/devops/devops.scm
src/devops/lint.scm

index ff27b93145dea618be0cfb6177d862f013a2b3f0..97339893a75fbb46fe1aa03884ce5ce9d732c5f3 100644 (file)
@@ -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")
index 548b9bb27c1b65ebbe54ef800bdb43ef78d2e88f..900000ac831524f3d05d788ac82b6592724bf7f3 100644 (file)
@@ -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)