From eda2c23874d298e7867ebd6d74213df3527ba8df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Jul 2023 13:51:54 +0200 Subject: 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. --- guix/scripts/refresh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit 1.4.1