diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-09 23:28:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-09 23:34:56 +0200 |
| commit | 638c5b79397aba92ab3211a1ea3b3418e112ec66 (patch) | |
| tree | e20df5c0e8a2429d038a1f5ed67790b1f18349e9 /guix | |
| parent | 2eca2d6267ae18e28dd63d72b1a37f784c7cad9e (diff) | |
| download | gnu-guix-638c5b79397aba92ab3211a1ea3b3418e112ec66.tar gnu-guix-638c5b79397aba92ab3211a1ea3b3418e112ec66.tar.gz | |
ui: 'string->duration' supports hours and seconds.
* guix/ui.scm (string->duration): Add seconds and hours.
* tests/ui.scm ("duration, 1 second"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/ui.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index cbc9dc841a..4d1b65cb8a 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -968,7 +968,15 @@ following patterns: \"1d\", \"1w\", \"1m\"." (make-time time-duration 0 (* 3600 hours (string->number (match:substring match 1))))) - (cond ((string-match "^([0-9]+)d$" str) + (cond ((string-match "^([0-9]+)s$" str) + => + (lambda (match) + (make-time time-duration 0 + (string->number (match:substring match 1))))) + ((string-match "^([0-9]+)h$" str) + (lambda (match) + (hours->duration 1 match))) + ((string-match "^([0-9]+)d$" str) => (lambda (match) (hours->duration 24 match))) |