hydra-eval-guile-jobs: Adjust to <license> objects.

* src/script/hydra-eval-guile-jobs.in (job-evaluations->sxml): Output
  the license name, not the external representation of <license>
  objects.
This commit is contained in:
Ludovic Courtès 2013-03-27 00:00:17 +01:00
parent 5ffc925ae7
commit 9da89dd32b

View file

@ -11,7 +11,7 @@ unset GUILE_LOAD_COMPILED_PATH
exec ${GUILE:-@GUILE@} --no-auto-compile \ exec ${GUILE:-@GUILE@} --no-auto-compile \
-l "$0" -c "(apply $main (cdr (command-line)))" "$@" -l "$0" -c "(apply $main (cdr (command-line)))" "$@"
!# !#
;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; Hydra is free software: you can redistribute it and/or modify ;;; Hydra is free software: you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by ;;; it under the terms of the GNU General Public License as published by
@ -97,7 +97,15 @@ symbol/thunk pairs."
'derivation-path->output-path) 'derivation-path->output-path)
drv)) drv))
,@(opt-attr 'homepage 'home-page) ,@(opt-attr 'homepage 'home-page)
,@(opt-attr 'license 'license) (license
,(let loop ((license (assoc-ref result 'license)))
(match license
((? struct?)
;; XXX: hack to access <license> objects
(struct-ref license 0))
((l ...)
(string-join (map loop l)))
(_ ""))))
,@(opt-attr 'description 'description) ,@(opt-attr 'description 'description)
,@(opt-attr 'longDescription 'long-description) ,@(opt-attr 'longDescription 'long-description)
(maintainers (maintainers