GNU bug report logs - #34097
[PATCH] import: github: Do not update URI for packages using git-fetch.

Previous Next

Full log

View this message in rfc822 format

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 34097 <at> debbugs.gnu.org
Cc: Eric Bavier <ericbavier <at> centurylink.net>
Subject: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch.
Date: Wed, 16 Jan 2019 15:43:09 +0530

[Message part 1 (text/plain, inline)]

During `guix refresh PACKAGE`, the source URI for packages using
git-fetch need not be updated. It can be returned unchanged, as it
is. The attached patch does that.

As a side issue, without this patch, git-fetch packages that do not have
a source URI ending in ".git" are not updated correctly using `guix
refresh PACKAGE`. See the package emacs-evil for an example.

[0001-import-github-Do-not-update-URI-for-packages-using-g.patch (text/x-patch, inline)]

From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Wed, 16 Jan 2019 15:21:06 +0530
Subject: [PATCH] import: github: Do not update URI for packages using
 git-fetch.

* guix/import/github.scm (updated-github-url): Return the unchanged source URI
for packages using git-fetch.
[updated-url]: Do not handle URIs which end with ".git".
---
 guix/import/github.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/import/github.scm b/guix/import/github.scm
index ad662e7b02..b287313d98 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben <at> gmail.com>
 ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2018 Eric Bavier <bavier <at> member.fsf.org>
+;;; Copyright © 2019 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,7 +55,6 @@ false if none is recognized"
                                       (github-user-slash-repository url)))
               (repo    (github-repository url)))
           (cond
-           ((string-suffix? ".git" url) url)
            ((string-suffix? (string-append "/tarball/v" version) url)
             (string-append prefix "/tarball/v" new-version))
            ((string-suffix? (string-append "/tarball/" version) url)
@@ -99,7 +99,7 @@ false if none is recognized"
              ((source-uri ...)
               (find updated-url source-uri))))
      ((eq? fetch-method download:git-fetch)
-      (updated-url (download:git-reference-url source-uri)))
+      (download:git-reference-url source-uri))
      (else #f))))
 
 (define (github-package? package)
-- 
2.19.2

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.