diff options
author | Leo Famulari <leo@famulari.name> | 2016-06-12 22:02:04 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-06-12 22:09:26 -0400 |
commit | ee86e7e14859533045e1f7727ae731ba6ba72daf (patch) | |
tree | a5f51a9c4859a3242b46876797b98e77a5a7506e /guix/ui.scm | |
parent | 8af5cac527eee03005f3809578a0d8258a878f95 (diff) | |
parent | fe585be9aa8f5158a7dfb6477d19ece3d643dec3 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/ui.scm')
-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))) |