diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-03-18 22:54:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-03-18 22:57:17 +0100 |
| commit | 71e08fde28fa335bdba2ec2150fd6663390bba5a (patch) | |
| tree | 71d35060faa1f92b6e15236098a58c4da6e8d84f /gnu/build/linux-modules.scm | |
| parent | e914b398af11f909e88a8bc85eeebb0768aacd54 (diff) | |
| download | gnu-guix-71e08fde28fa335bdba2ec2150fd6663390bba5a.tar gnu-guix-71e08fde28fa335bdba2ec2150fd6663390bba5a.tar.gz | |
glob: Add an extra glob pattern compilation stage.
* guix/glob.scm (compile-glob-pattern): Rename to...
(string->sglob): ... this.
(compile-sglob, string->compiled-sglob): New procedures.
(glob-match?): Replace '?, 'range, and 'set with a single clause.
* tests/glob.scm (test-compile-glob-pattern): Rename to...
(test-string->sglob): ... this. Adjust accordingly.
(test-glob-match): Use 'string->compiled-sglob' instead of
'compile-glob-pattern'.
* gnu/build/linux-modules.scm (read-module-aliases): Use
'string->compiled-sglob' instead of 'compile-glob-pattern'.
Diffstat (limited to 'gnu/build/linux-modules.scm')
| -rw-r--r-- | gnu/build/linux-modules.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index e97c9c95f1..87d2e98edf 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -329,7 +329,7 @@ The modules corresponding to these aliases can then be found using list of alias/module pairs where each alias is a glob pattern as like the result of: - (compile-glob-pattern \"scsi:t-0x01*\") + (string->compiled-sglob \"scsi:t-0x01*\") and each module is a module name like \"snd_hda_intel\"." (define (comment? str) @@ -354,7 +354,7 @@ and each module is a module name like \"snd_hda_intel\"." (line (match (tokenize line) (("alias" alias module) - (loop (alist-cons (compile-glob-pattern alias) module + (loop (alist-cons (string->compiled-sglob alias) module aliases))) (() ;empty line (loop aliases))))))) |