diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-02-01 10:32:49 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-02-01 10:32:49 +0100 |
| commit | ee82c2c71d8338d5f4ac567752723869e138514a (patch) | |
| tree | fdec1901069a909e134673365a02e4448e56d683 | |
| parent | 91249f5ee012d9c580006d7bb8b0a01930669d98 (diff) | |
| download | data-service-ee82c2c71d8338d5f4ac567752723869e138514a.tar data-service-ee82c2c71d8338d5f4ac567752723869e138514a.tar.gz | |
Refactor processing lint warnings
Extract out a function to make the code slightly easier to read.
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 86 |
1 files changed, 44 insertions, 42 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 86911df..832ac9d 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -247,6 +247,48 @@ WHERE job_id = $1" ',checker-name)) %local-checkers)) (check (lint-checker-check checker))) + + (define (process-lint-warning lint-warning) + (list + (match (lint-warning-location lint-warning) + (($ <location> file line column) + (list (if (string-prefix? "/gnu/store/" file) + ;; Convert a string like + ;; /gnu/store/53xh0mpigin2rffg31s52x5dc08y0qmr-guix-module-union/share/guile/site/2.2/gnu/packages/xdisorg.scm + ;; + ;; This happens when the checker uses + ;; package-field-location. + (string-join (drop (string-split file #\/) 8) "/") + file) + line + column))) + (let* ((source-locale "en_US.utf8") + (source-message + (begin + (setlocale LC_MESSAGES source-locale) + (lint-warning-message lint-warning))) + (messages-by-locale + (filter-map + (lambda (locale) + (catch 'system-error + (lambda () + (setlocale LC_MESSAGES locale)) + (lambda (key . args) + (error + (simple-format + #f + "error changing locale to ~A: ~A ~A" + locale key args)))) + (let ((message + (lint-warning-message lint-warning))) + (setlocale LC_MESSAGES source-locale) + (if (string=? message source-message) + #f + (cons locale message)))) + (list ,@locales)))) + (cons (cons source-locale source-message) + messages-by-locale)))) + (filter (match-lambda ((package-id . warnings) @@ -255,48 +297,8 @@ WHERE job_id = $1" (lambda (package-id package) (cons package-id - (map - (lambda (lint-warning) - (list - (match (lint-warning-location lint-warning) - (($ <location> file line column) - (list (if (string-prefix? "/gnu/store/" file) - ;; Convert a string like - ;; /gnu/store/53xh0mpigin2rffg31s52x5dc08y0qmr-guix-module-union/share/guile/site/2.2/gnu/packages/xdisorg.scm - ;; - ;; This happens when the checker uses - ;; package-field-location. - (string-join (drop (string-split file #\/) 8) "/") - file) - line - column))) - (let* ((source-locale "en_US.utf8") - (source-message - (begin - (setlocale LC_MESSAGES source-locale) - (lint-warning-message lint-warning))) - (messages-by-locale - (filter-map - (lambda (locale) - (catch 'system-error - (lambda () - (setlocale LC_MESSAGES locale)) - (lambda (key . args) - (error - (simple-format - #f - "error changing locale to ~A: ~A ~A" - locale key args)))) - (let ((message - (lint-warning-message lint-warning))) - (setlocale LC_MESSAGES source-locale) - (if (string=? message source-message) - #f - (cons locale message)))) - (list ,@locales)))) - (cons (cons source-locale source-message) - messages-by-locale)))) - (check package)))) + (map process-lint-warning + (check package)))) %package-table))))) (and |