* [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch.
@ 2019-01-16 10:13 Arun Isaac
2019-01-16 10:48 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Arun Isaac @ 2019-01-16 10:13 UTC (permalink / raw)
To: 34097
[-- Attachment #1.1: Type: text/plain, Size: 371 bytes --]
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.
[-- Attachment #1.2: 0001-import-github-Do-not-update-URI-for-packages-using-g.patch --]
[-- Type: text/x-patch, Size: 1787 bytes --]
From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@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@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)
--
2.19.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch.
2019-01-16 10:13 [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch Arun Isaac
@ 2019-01-16 10:48 ` Ludovic Courtès
2019-01-16 14:32 ` Eric Bavier
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2019-01-16 10:48 UTC (permalink / raw)
To: Arun Isaac; +Cc: 34097
Hi,
Arun Isaac <arunisaac@systemreboot.net> skribis:
> 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.
>
> From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001
> From: Arun Isaac <arunisaac@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".
LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch.
2019-01-16 10:48 ` Ludovic Courtès
@ 2019-01-16 14:32 ` Eric Bavier
2019-01-16 16:21 ` bug#34097: " Arun Isaac
0 siblings, 1 reply; 4+ messages in thread
From: Eric Bavier @ 2019-01-16 14:32 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34097
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
On Wed, 16 Jan 2019 11:48:00 +0100
Ludovic Courtès <ludo@gnu.org> wrote:
> Hi,
>
> Arun Isaac <arunisaac@systemreboot.net> skribis:
>
> > 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.
> >
> > From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001
> > From: Arun Isaac <arunisaac@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".
>
> LGTM, thanks!
LGTM too. I had considered something similar when I first patched the
updater for git-fetch, but hadn't found an example where it was needed
(e.g. "emacs-evil"). Thanks!
`~Eric
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#34097: [PATCH] import: github: Do not update URI for packages using git-fetch.
2019-01-16 14:32 ` Eric Bavier
@ 2019-01-16 16:21 ` Arun Isaac
0 siblings, 0 replies; 4+ messages in thread
From: Arun Isaac @ 2019-01-16 16:21 UTC (permalink / raw)
To: Eric Bavier, Ludovic Courtès; +Cc: 34097-done
[-- Attachment #1: Type: text/plain, Size: 40 bytes --]
Pushed! Thank you both for the review.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-16 16:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-16 10:13 [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch Arun Isaac
2019-01-16 10:48 ` Ludovic Courtès
2019-01-16 14:32 ` Eric Bavier
2019-01-16 16:21 ` bug#34097: " Arun Isaac
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).