From 13a3b9c748a80c0d4c79450e479416480273d2f7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 25 Oct 2020 14:52:12 -0400 Subject: maint: update-guix-package: Include the git.sv.gnu.org alias. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build-aux/update-guix-package.scm (%savannah-guix-git-repo-push-url): Rename to... (%savannah-guix-git-repo-push-url-regexp): ...this. Add the 'sv' alternative to 'savannah' and the (push) suffix in the URL regexp. (find-origin-remote): Adjust accordingly. Reported-by: Ludovic Courtès --- build-aux/update-guix-package.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build-aux') diff --git a/build-aux/update-guix-package.scm b/build-aux/update-guix-package.scm index 9b03b06c7c..ff6b105468 100644 --- a/build-aux/update-guix-package.scm +++ b/build-aux/update-guix-package.scm @@ -35,6 +35,7 @@ (gnu packages package-management) (ice-9 match) (ice-9 popen) + (ice-9 regex) (ice-9 textual-ports) (srfi srfi-1) (srfi srfi-2) @@ -126,8 +127,8 @@ (define-syntax-rule (with-temporary-git-worktree commit body ...) (lambda () (invoke "git" "worktree" "remove" "--force" tmp-directory)))))) -(define %savannah-guix-git-repo-push-url - "git.savannah.gnu.org/srv/git/guix.git") +(define %savannah-guix-git-repo-push-url-regexp + "git.(savannah|sv).gnu.org/srv/git/guix.git \\(push\\)") (define-syntax-rule (with-input-pipe-to-string prog arg ...) (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...)) @@ -143,10 +144,9 @@ (define (find-origin-remote) (and-let* ((remotes (string-split (with-input-pipe-to-string "git" "remote" "-v") #\newline)) - (origin-entry (find (cut string-contains <> - (string-append - %savannah-guix-git-repo-push-url - " (push)")) + (origin-entry (find (cut string-match + %savannah-guix-git-repo-push-url-regexp + <>) remotes))) (first (string-split origin-entry #\tab)))) -- cgit v1.2.3