From bfbb8c42fe71118624b31231f85744df43075442 Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Fri, 8 May 2015 00:36:31 +0900 Subject: [PATCH] package-name should ignore empty names --- lib/chibi/snow/package.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/chibi/snow/package.scm b/lib/chibi/snow/package.scm index 188e3763..46749baf 100644 --- a/lib/chibi/snow/package.scm +++ b/lib/chibi/snow/package.scm @@ -69,13 +69,11 @@ (define (package-name package) (and (pair? package) (eq? 'package (car package)) - (cond ((assoc-get (cdr package) 'name) - => (lambda (x) (and (pair? x) x))) - ((assq 'library (cdr package)) - => (lambda (x) (library-name x))) - ((assq 'progam (cdr package)) - => (lambda (x) (program-name x))) - (else #f)))) + (or (cond ((assoc-get (cdr package) 'name) + => (lambda (x) (and (pair? x) x))) + (else #f)) + (any library-name (package-libraries package)) + (any program-name (package-programs package))))) (define (package-email pkg) (and (package? pkg)