diff options
| author | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
| commit | cbe96f14700f4805552c47d5f163a75c35f86575 (patch) | |
| tree | d7791d29b283507bb8953a292d764b24774c955c /guix/scripts.scm | |
| parent | 337333c2567bdf767fdc8e04520c4bc0c8b33784 (diff) | |
| parent | 7a9a27a051a04a7fee2e7fe40127fedbe9112cfd (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts.scm')
| -rw-r--r-- | guix/scripts.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts.scm b/guix/scripts.scm index 3e19e38957..8534948892 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,12 +50,12 @@ ;;; ;;; Code: -(define (args-fold* options unrecognized-option-proc operand-proc . seeds) +(define (args-fold* args options unrecognized-option-proc operand-proc . seeds) "A wrapper on top of `args-fold' that does proper user-facing error reporting." (catch 'misc-error (lambda () - (apply args-fold options unrecognized-option-proc + (apply args-fold args options unrecognized-option-proc operand-proc seeds)) (lambda (key proc msg args . rest) ;; XXX: MSG is not i18n'd. |