diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-07-17 13:51:54 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-07-17 13:51:54 +0200 |
| commit | eda2c23874d298e7867ebd6d74213df3527ba8df (patch) | |
| tree | c2480db110f95ce6c6743f471b7193dabde1a424 | |
| parent | ad08f9331fee7a8e71e94b02f86f54ab3e1001a8 (diff) | |
| download | guix-eda2c23874d298e7867ebd6d74213df3527ba8df.tar.gz | |
scripts/refresh: Remove column from spec line before sorting.
We want to sort by file and line number, but the column number messes everything up. This is a follow-up to commit b43841c124d15eaecc41b3928f08a26dbd5c653a. * guix/scripts/refresh.scm (guix-refresh): Trim the digits on the right of the location string before comparing them.
| -rw-r--r-- | guix/scripts/refresh.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index 719883d4a9..a9241aa20d 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -591,7 +591,8 @@ all are dependent packages: ~{~a~^ ~}~%") (string-append (config-directory) "/upstream/trustedkeys.kbx")))) (let* ((spec-line - (compose location->string + (compose (cut string-trim-right <> char-set:digit) + location->string package-location update-spec-package)) ;; Sort the specs so that we update packages from the |