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".
master
Arun Isaac 2019-01-16 15:21:06 +05:30
parent 4eacd52cd0
commit 9a5091d0c1
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 2 additions and 2 deletions

View File

@ -2,6 +2,7 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Arun Isaac <arunisaac@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)