From patchwork Wed Jan 16 10:13:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 750 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BB34516A7A; Wed, 16 Jan 2019 10:14:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 54E5016A78 for ; Wed, 16 Jan 2019 10:14:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:43682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjiD2-00052E-FQ for patchwork@mira.cbaines.net; Wed, 16 Jan 2019 05:14:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjiD0-00051r-HZ for guix-patches@gnu.org; Wed, 16 Jan 2019 05:14:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjiCx-00042y-RK for guix-patches@gnu.org; Wed, 16 Jan 2019 05:14:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjiCw-00040M-Fd for guix-patches@gnu.org; Wed, 16 Jan 2019 05:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gjiCw-0007Lp-4o for guix-patches@gnu.org; Wed, 16 Jan 2019 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jan 2019 10:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34097 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34097@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154763362228224 (code B ref -1); Wed, 16 Jan 2019 10:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2019 10:13:42 +0000 Received: from localhost ([127.0.0.1]:60680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCb-0007L9-RN for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCa-0007Kw-0I for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:43220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCU-0000y9-Jq for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjiCR-0004sN-Hk for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjiCQ-0000Oy-2s for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:31 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:50962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCP-0008Bc-HH for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0jisTuCJkFgEgTElvV0KayzIvrtOsi48UU0JfYACpfc=; b=Y0lrpaOZm8kxcktzELd2Wcx8KC Gr4GopIbaCyPRfmi6IkGMN46f4LUAPMqHaqGtQ5VP6A/S9AxU4xYCyeL6giuZKVk3t09I/jx5VsG6 a0xQzAroOUd0/sxFTnpsHA71sE7bJcrU6QU9NoiWjBzim/S6ON8vp2SPC8YsHc9iIhR4=; Received: from [14.139.128.10] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gjiCI-0002XH-2S; Wed, 16 Jan 2019 15:43:23 +0530 From: Arun Isaac Date: Wed, 16 Jan 2019 15:43:09 +0530 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2019 Arun Isaac ;;; ;;; 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