From 4c197ec6e66208a03463daac74be613e523ddab5 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 6 Nov 2011 18:57:12 -0800 Subject: [PATCH] tools.deploy.backend: fix vocab manifest parse We were absent-mindedly passing the VOCABS: line off as a vocab name itself. vocabs.loader doesn't put up with that anymore. --- basis/tools/deploy/backend/backend.factor | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor index f352b08930..0fabf39b6c 100644 --- a/basis/tools/deploy/backend/backend.factor +++ b/basis/tools/deploy/backend/backend.factor @@ -113,10 +113,11 @@ DEFER: ?make-staging-image ] bind ; : parse-vocab-manifest-file ( path -- vocab-manifest ) - utf8 file-lines - dup first "VOCABS:" = - [ { "LIBRARIES:" } split1 vocab-manifest boa ] - [ "invalid vocab manifest!" throw ] if ; + utf8 file-lines [ "empty vocab manifest!" throw ] [ + unclip-slice "VOCABS:" = + [ { "LIBRARIES:" } split1 vocab-manifest boa ] + [ "invalid vocab manifest!" throw ] if + ] if-empty ; : make-deploy-image ( vm image vocab config -- manifest ) make-boot-image