diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-09-27 23:10:29 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-09-27 23:10:29 +0200 |
| commit | 41b427e1b220389eccd65e436fc3452e2bc0215d (patch) | |
| tree | 431584749084f7b041d406153cfcf1ad1f043737 /scm/mcron/job-specifier.scm | |
| parent | c0a6eb14c257a47e9573631e5ac09e6528fba377 (diff) | |
| download | mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.tar.gz mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.tar.bz2 mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.zip | |
Revert "Taken on board suggestions of Mathieu Lirzin as per e-mails to the bug-mcron@gnu.org mailing list around September 2015."
This reverts commit c0a6eb14c257a47e9573631e5ac09e6528fba377.
Diffstat (limited to 'scm/mcron/job-specifier.scm')
| -rw-r--r-- | scm/mcron/job-specifier.scm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/scm/mcron/job-specifier.scm b/scm/mcron/job-specifier.scm index 7ed912b..cce948c 100644 --- a/scm/mcron/job-specifier.scm +++ b/scm/mcron/job-specifier.scm @@ -34,7 +34,7 @@ set-configuration-time job find-best-next) - #:use-module (mcron mcron-core) + #:use-module (mcron core) #:use-module (mcron environment) #:use-module (mcron vixie-time) #:re-export (append-environment-mods)) @@ -203,16 +203,11 @@ (define configuration-user (getpw (getuid))) (define configuration-time (current-time)) - - (define (set-configuration-user user) (set! configuration-user (if (or (string? user) (integer? user)) (getpw user) user))) - - - (define (set-configuration-time time) (set! configuration-time time)) @@ -238,9 +233,10 @@ ((list? action) (lambda () (primitive-eval action))) ((string? action) (lambda () (system action))) (else - (throw 'mcron-error 2 - "job: invalid second argument (action; should be lambda " - "function, string or list)")))) + (throw 'mcron-error + 2 + "job: invalid second argument (action; should be lambda" + " function, string or list)")))) (time-proc (cond ((procedure? time-proc) time-proc) @@ -248,9 +244,10 @@ ((list? time-proc) (lambda (current-time) (primitive-eval time-proc))) (else - (throw 'mcron-error 3 - "job: invalid first argument (next-time-function; " - "should be function, string or list)")))) + (throw 'mcron-error + 3 + "job: invalid first argument (next-time-function; should ") + "be function, string or list)"))) (displayable (cond ((not (null? displayable)) (car displayable)) ((procedure? action) "Lambda function") |