From 9da89dd32bc161daebf491b00f61469593f3918f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 27 Mar 2013 00:00:17 +0100 Subject: [PATCH] hydra-eval-guile-jobs: Adjust to objects. * src/script/hydra-eval-guile-jobs.in (job-evaluations->sxml): Output the license name, not the external representation of objects. --- src/script/hydra-eval-guile-jobs.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/script/hydra-eval-guile-jobs.in b/src/script/hydra-eval-guile-jobs.in index b8405e35..bd841cdd 100644 --- a/src/script/hydra-eval-guile-jobs.in +++ b/src/script/hydra-eval-guile-jobs.in @@ -11,7 +11,7 @@ unset GUILE_LOAD_COMPILED_PATH exec ${GUILE:-@GUILE@} --no-auto-compile \ -l "$0" -c "(apply $main (cdr (command-line)))" "$@" !# -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; Hydra is free software: you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -97,7 +97,15 @@ symbol/thunk pairs." 'derivation-path->output-path) drv)) ,@(opt-attr 'homepage 'home-page) - ,@(opt-attr 'license 'license) + (license + ,(let loop ((license (assoc-ref result 'license))) + (match license + ((? struct?) + ;; XXX: hack to access objects + (struct-ref license 0)) + ((l ...) + (string-join (map loop l))) + (_ "")))) ,@(opt-attr 'description 'description) ,@(opt-attr 'longDescription 'long-description) (maintainers