branch master updated: maint: update-guix-package: Include the git.sv.gnu.org alias.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 13a3b9c  maint: update-guix-package: Include the git.sv.gnu.org alias.
13a3b9c is described below

commit 13a3b9c748a80c0d4c79450e479416480273d2f7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 25 14:52:12 2020 -0400

    maint: update-guix-package: Include the git.sv.gnu.org alias.
    
    * 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 <ludo@gnu.org>
---
 build-aux/update-guix-package.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-aux/update-guix-package.scm 
b/build-aux/update-guix-package.scm
index 9b03b06..ff6b105 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 @@ COMMIT."
        (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 @@ COMMIT."
   (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))))