From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jul 2017 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 27550@debbugs.gnu.org Cc: Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149892127131996 (code B ref -1); Sat, 01 Jul 2017 15:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jul 2017 15:01:11 +0000 Received: from localhost ([127.0.0.1]:47828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJtX-0008K0-Lm for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJtW-0008Jo-51 for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJtP-0003q3-SH for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRJtP-0003pw-Pf for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRJtO-0003qy-Rf for guix-patches@gnu.org; Sat, 01 Jul 2017 11:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJtK-0003iX-0v for guix-patches@gnu.org; Sat, 01 Jul 2017 11:01:02 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dRJtJ-0003hj-Pr for guix-patches@gnu.org; Sat, 01 Jul 2017 11:00:57 -0400 Received: by mail-wr0-x243.google.com with SMTP id 77so41232126wrb.3 for ; Sat, 01 Jul 2017 08:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mTslogMU8eU0p/I5KydWXjbDFA2olYkTIyfT96folls=; b=DzD/pRio0LaqUizmP5Ma2CJlrb7SAMII7DXLchWd4+2cPuXjlNx5S5TujT7j/9lqPc lsvFmMPwmjXAI36peTQdbnmHwzqbjmzRlPqsScu6DpyVijUn6Kg3vhzUD3fVl/im41Z8 /1WqfuMWCGbsx8bY7vPqyebhN7hIQH97ew6yt6kG+VULMD3BRGZDQ2Sq+AyngLfTHIMz gawHvWvZp5SFCJ52+07ICR2Ubmh07NpPRH+t46CP0zr+Yzs4N8HmrrRqBGMyU+lgMxLO jHabkHOAtfXYg3T17My3GT/H1xcvpCyD/UDxyd0thGaZ1FteFyrWRE2xTBz5AJbzDh3Y 8k+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mTslogMU8eU0p/I5KydWXjbDFA2olYkTIyfT96folls=; b=mqsf45plCEs7dmReVi5vjF7BZ0VNkdAfpibicnkFfsQVTLjt6+vvHO9YLxjx2TT/Lg tnn+PY9c+OjvECmJ46uhqnDvduVDC14tmdklylMyynGWMEuFKD7VK5hcy51hkC3JPmSQ VqNiQlnqhr4VOxtllY67eNk1lGsQ9gKYGNwi8A+pVCwn8E6bBU9f/TVs9C0/gLRh8PQP j0bgRbXVaVOdNZQ03OJNhGkSTyrLENvzYykUS6LQehYVRk4HpbbU5T6MifFNgYpPrwNY iqjnlT2NGbLSFmLav03I+JHmRNX67mR6cYAneINVxXSNWr7Z31/2DxON7b9Za7QHRd+l D/vQ== X-Gm-Message-State: AKS2vOyTKcvvmd31jyRGHkHkfMmZ1RKdH/ZlQP0BwG8kGSxvPmLYtqF6 fpN1RSRRV2mnDo97 X-Received: by 10.223.173.143 with SMTP id w15mr26788957wrc.113.1498921256345; Sat, 01 Jul 2017 08:00:56 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id x131sm4610605wmg.13.2017.07.01.08.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 08:00:55 -0700 (PDT) From: Mathieu Othacehe Date: Sat, 1 Jul 2017 17:00:43 +0200 Message-Id: <20170701150043.14654-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -6.8 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.8 (------) Hi, Here are two patches to remove useless/duplicated stuff from cuirass and prepare (guix git) integration. Thanks, Mathieu Mathieu Othacehe (2): repo: remove git-repo. utils: Remove useless procedures. bin/cuirass.in | 4 +-- bin/evaluate.in | 2 +- src/cuirass/base.scm | 2 +- src/cuirass/repo.scm | 38 +--------------------------- src/cuirass/utils.scm | 69 +-------------------------------------------------- tests/repo.scm | 32 ------------------------ tests/utils.scm | 15 ----------- 7 files changed, 6 insertions(+), 156 deletions(-) -- 2.13.1 From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 1/2] repo: remove git-repo. References: <20170701150043.14654-1-m.othacehe@gmail.com> In-Reply-To: <20170701150043.14654-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jul 2017 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 27550@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149892138532199 (code B ref 27550); Sat, 01 Jul 2017 15:04:02 +0000 Received: (at 27550) by debbugs.gnu.org; 1 Jul 2017 15:03:05 +0000 Received: from localhost ([127.0.0.1]:47834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJvN-0008NC-1q for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:03:05 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:33770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJvK-0008MW-Oi for 27550@debbugs.gnu.org; Sat, 01 Jul 2017 11:03:03 -0400 Received: by mail-wm0-f51.google.com with SMTP id z75so30103703wmc.0 for <27550@debbugs.gnu.org>; Sat, 01 Jul 2017 08:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P1xDNpih0ZrGjLXCLvYiMAk3HhA0mEJJewI3By4dQfw=; b=SzhrVLPShuadQ0zlf00IpyJdR26gxfV84nVX4CyNvXwM+++B0nrYmQEbgRgwQXVPWq VNyFD4sNLlfxSY076T5tTKjKWSG/fB7ymPnxLuJ75KsbeAaD6RwuaBgdD4lxPw1BUYe8 lrVDdZrVVD/Kd+ZiN2noRJKNMbxLaSajWpo+WLCHiDzedA2HgaB9hbb7q/U4lZ/BsuaQ s5UflGxvxL/QEeJNtOubj+kHhCmDpitT3nTHrYhP61vszRWxqFrLKXtMelXODtpMTcQE LPVbs5DmE7Dm0d9fqF3bCswdWK+zLkC3MA8ZRkx9dn6ryL6BgcO1W+op0mz2CN+kf82w RIUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P1xDNpih0ZrGjLXCLvYiMAk3HhA0mEJJewI3By4dQfw=; b=uL5eNr/X0sFe41vkURbmsZmBHmsEkGvu8qzZrB81IYhXrs656zB7e40hwfR3l0zSv+ 3GL/O+Lc/3Myy5tfXL2WJmuOuKes4LMXnk6t2MFtibQZuTn27Z3A9FTmr7eQuenwqbSd wcSc0dca+IBBWE1c17ZZXvyLVlBFmZ1HLbtiXnXo4L9g+Muj4kGhDth1cLY4iLsxOqph YfeFcaSyxIkgxEyI0JaA4HgqA1TvAkMUVZJjNr8Cp7WPFOVHcNjqdbY/2Podxr/oNwDj hDI7eyd3AU6LNhYJEI8u3gYLlxupTavZM6Bw5g36ffxlKc9juII+Os4vuLEBxBKJtfb8 V/dg== X-Gm-Message-State: AKS2vOxx1nioAeIJm0VlCRxXBoHclxKAH1Un6abdvA5oGxfgPcJF4Ib1 Ol1hMPO3c7Fq4c2p X-Received: by 10.28.218.149 with SMTP id r143mr17747985wmg.74.1498921376574; Sat, 01 Jul 2017 08:02:56 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id e65sm7836961wma.19.2017.07.01.08.02.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 08:02:56 -0700 (PDT) From: Mathieu Othacehe Date: Sat, 1 Jul 2017 17:02:50 +0200 Message-Id: <20170701150251.14913-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * src/cuirass/repo.scm (git-repo): Remove it. * tests/repo.scm: Remove related tests. git-repo is not used and it's usecases will be covered by (guix git). --- src/cuirass/repo.scm | 38 +------------------------------------- tests/repo.scm | 32 -------------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) diff --git a/src/cuirass/repo.scm b/src/cuirass/repo.scm index be5ea5b..26ea328 100644 --- a/src/cuirass/repo.scm +++ b/src/cuirass/repo.scm @@ -30,8 +30,7 @@ repo-snapshot repo-updater repo-update - file-repo - git-repo)) + file-repo)) (define-immutable-record-type ;; An Abstract repository. Use "repo" as a shortname for "repository". @@ -79,38 +78,3 @@ #:location file-name #:snapshoter file-repo-snapshot #:updater file-repo-update)))) - -(define git-repo - (let ((git "git") - (hash-algo "sha256")) - (define (git-repo-snapshot this store) - "Add a snapshot of URL to STORE. " - (let ((dir (repo-location this)) - (id (repo-id this))) - (call-with-temporary-directory - (λ (tmpdir) - (let ((tmp-repo (string-append tmpdir "/" dir))) - (and (zero? (system* "cp" "-R" dir tmpdir)) - (with-directory-excursion tmp-repo - (zero? (system* "rm" "-rf" ".git"))) - (add-to-store store id #t hash-algo tmp-repo))))))) - - (define (git-repo-update this ref) - (let ((url (repo-url this)) - (dir (repo-location this))) - (and - (or (file-exists? dir) - (zero? (system* git "clone" url dir)) - (error "file not found")) - (with-directory-excursion dir - (and (zero? (system* git "pull")) - (zero? (system* git "reset" "--hard" ref))))))) - - (λ* (#:key url dir) - "Create a Git repository. URL is the location of the remote repository. -REF is the identifier that is tracked." - (repo #:id dir - #:url url - #:location dir - #:snapshoter git-repo-snapshot - #:updater git-repo-update)))) diff --git a/tests/repo.scm b/tests/repo.scm index fc73a64..8890c0a 100644 --- a/tests/repo.scm +++ b/tests/repo.scm @@ -76,38 +76,6 @@ name." ;; Cleanup. (delete-file file-name)) -;;; -;;; Git repository. -;;; - -(define (create-git-repository name) - (let ((git "git")) - (system* git "init" name) - (with-directory-excursion name - (create-file "foo") - (system* git "add" "foo") - (system* git "commit" "-m" "'foo'")))) - -(test-group-with-cleanup "git-repo" - (define rpt (git-repo #:url file-name - #:dir "git-example")) - - ;; Since repository doesn't exist yet, 'repo-update' should throw an error. - (test-error "git-repo-update: file not found" - 'system-error - (repo-update rpt "master")) - - (create-git-repository file-name) - - (test-assert "git-repo-update" - (repo-update rpt "master")) - - (test-assert "git-repo-snapshot" - (in-store? (repo-snapshot rpt store))) - - ;; Cleanup. - (system* "rm" "-rf" file-name "git-example")) - (close-connection store) (test-end) -- 2.13.1 From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 2/2] utils: Remove useless procedures. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jul 2017 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 27550@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149892138732208 (code B ref 27550); Sat, 01 Jul 2017 15:04:02 +0000 Received: (at 27550) by debbugs.gnu.org; 1 Jul 2017 15:03:07 +0000 Received: from localhost ([127.0.0.1]:47836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJvP-0008NQ-Cu for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:03:07 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:36753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJvM-0008MZ-MK for 27550@debbugs.gnu.org; Sat, 01 Jul 2017 11:03:05 -0400 Received: by mail-wm0-f47.google.com with SMTP id 62so133058688wmw.1 for <27550@debbugs.gnu.org>; Sat, 01 Jul 2017 08:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ar2Ilor6/MtOIHNMyjuekylkWk8cYqFag+HEpKkyhJk=; b=LSb3ZvU36G5IfhSXjZg7rTHLmpbuY3yCXJeNlzxcE0Kkzmdky01zvx6M0j4kqHxMbg BLSzcRosrQCTOa+v+jQFPIxIKyPCVARXBxB83EaTOPpUdNQHpHBA2kQQwylRZoVsQdK2 NVbDkRH1dHUDXgboDSrlIRV1o9cuF7thaaD2EtyRRyfWOQl7CYy5uMNHNAd42GcL7tj9 OjDOxbhNGfi3NcA6cg8ZXqY4m6LcmrUB3gpyndEa+BkcpZoQWjV3JiQZvgh7gqDq5pQ5 jOImoSSeaAopK91loaNNEGKBISgVUBaTxPjNFzhNt08+Q+ttddUgzpiqvAOjLBLcYVYI Kmpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ar2Ilor6/MtOIHNMyjuekylkWk8cYqFag+HEpKkyhJk=; b=KoZ2wO7TEQ2O+4LOgWmI2UdIDXv/SCzVHP8EdL00KDNNT5EWQXMHdT/AVGkwiiVuwV O6vhWiznCB8y1bl27/CvxOpOrucjhOlF/1iG3z6PtgN3ve4rKUm9BbKiDcwcYGlpPSKi /DhyxY/dcAy5SPBwbwQhIMVIiE9W3MnUzfyMWBm06MdlbW+4nJTS5sn23g846YUacEpG UphSNNoNMKotg+wgi3IicZywnMDH7zBmuYJOZdvpp4T6vGTnCx0j2AGPUxQ9T3VMFVNl hvqRO2U6TK+UeMra6IGjksefR5COuAtaHc2Bp3sDUOegX4RibxkhCNR4b8uLY8vFxz91 7XMA== X-Gm-Message-State: AKS2vOx4s9n/O+GS9/8i23FI5lq/JOFgVyt/cEb+N4HmAK5gW81RjzE3 9O46iSXgG0SrzET0 X-Received: by 10.28.10.194 with SMTP id 185mr19629285wmk.119.1498921378890; Sat, 01 Jul 2017 08:02:58 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id e65sm7836961wma.19.2017.07.01.08.02.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 08:02:58 -0700 (PDT) From: Mathieu Othacehe Date: Sat, 1 Jul 2017 17:02:51 +0200 Message-Id: <20170701150251.14913-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170701150251.14913-1-m.othacehe@gmail.com> References: <20170701150251.14913-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * src/cuirass/utils.scm (mkdir-p, make-user-module, call-with-temporary-directory, with-directory-excursion): Remove because already defined in guix. * tests/utils (with-directory-excursion): Remove associated test. * src/cuirass/base.scm: Use (guix build utils) to provide procedure removed from (cuirass utils). * bin/evaluate.in: Ditto. * bin/cuirass.in: Use "make-user-module" provided by (guix ui). --- bin/cuirass.in | 4 +-- bin/evaluate.in | 2 +- src/cuirass/base.scm | 2 +- src/cuirass/utils.scm | 69 +-------------------------------------------------- tests/utils.scm | 15 ----------- 5 files changed, 5 insertions(+), 87 deletions(-) diff --git a/bin/cuirass.in b/bin/cuirass.in index 7df5ddb..27efaac 100644 --- a/bin/cuirass.in +++ b/bin/cuirass.in @@ -26,7 +26,7 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" (use-modules (cuirass) (cuirass ui) - (cuirass utils) + (guix ui) (ice-9 getopt-long)) (define (show-help) @@ -90,7 +90,7 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" (and specfile (let ((new-specs (save-module-excursion (λ () - (set-current-module (make-user-module)) + (set-current-module (make-user-module '())) (primitive-load specfile))))) (for-each (λ (spec) (db-add-specification db spec)) new-specs))) diff --git a/bin/evaluate.in b/bin/evaluate.in index 8875238..09a785b 100644 --- a/bin/evaluate.in +++ b/bin/evaluate.in @@ -26,9 +26,9 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" ;;; along with Cuirass. If not, see . (use-modules (cuirass) - (cuirass utils) (ice-9 match) (ice-9 pretty-print) + (guix build utils) (guix store)) (define* (main #:optional (args (command-line))) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index fc3cc1a..58f2be3 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -20,8 +20,8 @@ (define-module (cuirass base) #:use-module (cuirass database) - #:use-module (cuirass utils) #:use-module (gnu packages) + #:use-module (guix build utils) #:use-module (guix derivations) #:use-module (guix store) #:use-module (ice-9 format) diff --git a/src/cuirass/utils.scm b/src/cuirass/utils.scm index bcd5e12..dbe00a0 100644 --- a/src/cuirass/utils.scm +++ b/src/cuirass/utils.scm @@ -23,12 +23,8 @@ #:use-module (srfi srfi-1) #:export (;; Procedures alist? - mkdir-p - make-user-module - call-with-temporary-directory ;; Macros. - λ* - with-directory-excursion)) + λ*)) (define-syntax-rule (λ* formals body ...) (lambda* formals body ...)) @@ -37,66 +33,3 @@ "Return #t if OBJ is an alist." (and (list? obj) (every pair? obj))) - -(define mkdir-p - (let ((not-slash (char-set-complement (char-set #\/)))) - (λ* (dir #:optional mode) - "Create directory DIR and all its ancestors." - (let ((absolute? (string-prefix? "/" dir))) - (let loop ((components (string-tokenize dir not-slash)) - (root (if absolute? "" "."))) - (match components - ((head tail ...) - (let ((dir-name (string-append root "/" head))) - (catch 'system-error - (λ () - (if mode - (mkdir dir-name mode) - (mkdir dir-name)) - (loop tail dir-name)) - (λ args - ;; On GNU/Hurd we can get EROFS instead of EEXIST here. - ;; Thus, if we get something other than EEXIST, check - ;; whether DIR-NAME exists. See - ;; . - (if (or (= EEXIST (system-error-errno args)) - (let ((st (stat dir-name #f))) - (and st (eq? 'directory (stat:type st))))) - (loop tail dir-name) - (apply throw args)))))) - (() #t))))))) - -(define-syntax-rule (with-directory-excursion dir body ...) - "Run BODY with DIR as the process's current directory." - (let ((init (getcwd))) - (dynamic-wind - (λ () (chdir dir)) - (λ () body ...) - (λ () (chdir init))))) - -(define* (make-user-module #:optional (modules '())) - "Return a new user module with the additional MODULES loaded." - ;; Module in which the machine description file is loaded. - (let ((module (make-fresh-user-module))) - (for-each (lambda (iface) - (module-use! module (resolve-interface iface))) - modules) - module)) - - -;;; -;;; Temporary files. -;;; - -(define (call-with-temporary-directory proc) - "Call PROC with a name of a temporary directory; close the directory and -delete it when leaving the dynamic extent of this call." - (let* ((parent (or (getenv "TMPDIR") "/tmp")) - (tmp-dir (string-append parent "/" (basename (tmpnam))))) - (mkdir-p tmp-dir) - (dynamic-wind - (const #t) - (lambda () - (proc tmp-dir)) - (lambda () - (false-if-exception (rmdir tmp-dir)))))) diff --git a/tests/utils.scm b/tests/utils.scm index 6a14355..d5298c5 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -35,19 +35,4 @@ (not (alist? 'foo)) (not (alist? #:bar)))) -(test-assert "with-directory-excursion" - (let ((old (getcwd)) - (tmp (tmpnam))) - (dynamic-wind - (λ () - (mkdir tmp)) - (λ () - (with-directory-excursion tmp - (dir-1 (getcwd))) - (dir-2 (getcwd)) - (and (string=? (dir-1) tmp) - (string=? (dir-2) old))) - (λ () - (rmdir tmp))))) - (test-end) -- 2.13.1 From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2017 12:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149908363228899 (code B ref 27550); Mon, 03 Jul 2017 12:08:02 +0000 Received: (at 27550) by debbugs.gnu.org; 3 Jul 2017 12:07:12 +0000 Received: from localhost ([127.0.0.1]:49496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS08G-0007W3-BF for submit@debbugs.gnu.org; Mon, 03 Jul 2017 08:07:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS08F-0007Vr-7R for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 08:07:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS086-0007kg-O2 for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 08:07:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS086-0007kc-Kj; Mon, 03 Jul 2017 08:07:02 -0400 Received: from [193.50.110.99] (port=56960 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dS086-0001IW-3w; Mon, 03 Jul 2017 08:07:02 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170701150043.14654-1-m.othacehe@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Messidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Mon, 03 Jul 2017 14:07:00 +0200 In-Reply-To: <20170701150043.14654-1-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Sat, 1 Jul 2017 17:00:43 +0200") Message-ID: <87inj9pvvf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -7.8 (-------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -7.8 (-------) Hi Mathieu, Mathieu Othacehe skribis: > Here are two patches to remove useless/duplicated stuff from cuirass > and prepare (guix git) integration. Woohoo, glad to see progress on this front! > Mathieu Othacehe (2): > repo: remove git-repo. > utils: Remove useless procedures. FWIW, I prefer to bake patches in such a way that the repo is always usable at any given commit; doing that allows for bug hunting for =E2=80=98= git bisect=E2=80=99, among other things. If we applied these patches, we=E2=80= =99d be left with a dysfunctional Cuirass, IIUC. What about instead coming up with a single patch that replaces =E2=80=98git-repo=E2=80=99 with its Guile-Git counterpart? The removal of = unused procedures can come separately, or along with this patch. Thanks, Ludo=E2=80=99. From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2017 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149908414829613 (code B ref 27550); Mon, 03 Jul 2017 12:16:02 +0000 Received: (at 27550) by debbugs.gnu.org; 3 Jul 2017 12:15:48 +0000 Received: from localhost ([127.0.0.1]:49502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS0Ga-0007hY-8L for submit@debbugs.gnu.org; Mon, 03 Jul 2017 08:15:48 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS0GZ-0007hK-3q for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 08:15:47 -0400 Received: by mail-wr0-f194.google.com with SMTP id z45so44703186wrb.2 for <27550@debbugs.gnu.org>; Mon, 03 Jul 2017 05:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=Td9/yojTzO3jy/Pn5d//F5UrhTImGQPYJhsXVDT2fSc=; b=CSff+xnEvSgmKSrJFUfU+hMmSsKwb+wd6wTmVIhTJk+bPdNUZ98TyACXGzKP9bsGtm dWOb+fBzz/rDMsjY22r5BWetwEMC5NTtWinirzTeoqY2JNrh7vlz/y3XcQwwxdr5UPmt FtVi7vNvC65KlyvltmLbIBMEYdVyNuVPKx4+AHBVwqrsFBm5yeUaRIVeDnA4u5IR0QJ7 2kNS2K8l171IRPMt2TvK/vWU+qdISZEM0Qy21junwxRlE8XBtIvcs4CungyYeLB9/wle APbtoIH0PCJb1N7RkTlZwJuNZPz0AhK2ZltyxWyZ+vKKadD3ZwAyUO4DClyW1VvSN6O4 ewBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=Td9/yojTzO3jy/Pn5d//F5UrhTImGQPYJhsXVDT2fSc=; b=DFFnpgYNArpw2MvFU+y4Beh7T6uHHcNHz3NxDn+/Qd44R5Hii7Q6eds9fZHNZlhJWR v0tDwn9j2PLxYHd3pD8m0sd7DfpVfGqgU3VwhM9X5ad6S6DTcGF30HpKrHp6E31nFRdF nX9Hapm9pDnY/UFVq40SgUP/BZsJKppCvLCtE0696DXVTFAltvzjTVpS2nz+LfbHu5UJ m+fYI9011doxWj0AXS6FjJose/lyCXXjxmSuCLcsGT8Gx7JS2rC5eHKksY/2XpOeDkR7 L4DvXYAZAKe4fiPaa4r6Rf8U6OpU3PJfbJNwR96CP3lK/FGugdAHNnridTqCL48N5dhw FRcQ== X-Gm-Message-State: AKS2vOx+uVDzNCfjVXlSavhShxYtEckZQboB2y6Syx+jueVZ3YrtLSE8 06t8aK05bXR6/RD8 X-Received: by 10.223.152.20 with SMTP id v20mr36263514wrb.8.1499084141298; Mon, 03 Jul 2017 05:15:41 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id d69sm7725344wmd.23.2017.07.03.05.15.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2017 05:15:40 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <87inj9pvvf.fsf@gnu.org> Date: Mon, 03 Jul 2017 14:15:45 +0200 Message-ID: <868tk5ogwe.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Ludo, > What about instead coming up with a single patch that replaces > ‘git-repo’ with its Guile-Git counterpart? The removal of unused > procedures can come separately, or along with this patch. I got your point but unless I'm wrong git-repo is not used in cuirass. So removing it does not have any functional impact on Cuirass. Anyway the (guix git) binding is almost ready, I'll send a patch soon. Thanks, Mathieu From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2017 13:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149908995612639 (code B ref 27550); Mon, 03 Jul 2017 13:53:02 +0000 Received: (at 27550) by debbugs.gnu.org; 3 Jul 2017 13:52:36 +0000 Received: from localhost ([127.0.0.1]:49547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS1mE-0003Hl-Tj for submit@debbugs.gnu.org; Mon, 03 Jul 2017 09:52:36 -0400 Received: from mail-wr0-f169.google.com ([209.85.128.169]:33598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS1mD-0003HX-HN for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 09:52:33 -0400 Received: by mail-wr0-f169.google.com with SMTP id r103so234939395wrb.0 for <27550@debbugs.gnu.org>; Mon, 03 Jul 2017 06:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=xytSbPuuF/X7WrAn0Mm83/5QNJMKqc+sgJoLt0v93kA=; b=ERXzvVQzhJS8NokXcxVAFNZzdc9smG2Ycadfp/eXKVID1G0qCKOE+LpDn9b0u0waQA g/mULROX4fBXAQIqOiypfkRdxHsvMv8UPOcoSNrx0QxPcjmmETcD0w+yoJkS13pPzVpi HD9ALGjBf2sOYi/ktCCOC4WLmN5AMKqiu6Uyu5d4ITD802Ky+bWnX95e9jxnkUkvFsXr XkKNG7ig2+5XqmUhJVVrcr6Slg7ZIq/Ve3bRRmGQX7I1iL0kxMqjOXxltjgzxoOeJJe1 mfNTH/oGlrBXvNO8OSFZUi9NWSvR1ns8hv3kYypdIZOhkwIM74D9P36+SMBz9a8BiCpH ag3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=xytSbPuuF/X7WrAn0Mm83/5QNJMKqc+sgJoLt0v93kA=; b=QX8db8v2uFMCdzpm1JOJ8iqvCgC0RLW59bqthrFnIt/oQH4eO8a+eey3i34q/gRzon jfXTiTnhWpcDDDZYbunh8C+ZJHGSgMc+rP09RkFAxEYt/INQ+xaSgaCjfrsCHErkgRIb 5gQEoMLfve8oFlljwfC2k0LCBQLyCsukeMo7MyKCmGLlCadlZaQ31lv8IHG8VVKzE1t0 6lPAWr0UAtWRDHiOj9y7m/GFvbqvC+eyV2JxgO+c8gWxs23gF43vYYJodEzHL1Py16W5 JT5UxftuvEwPk8V1M/4LK6KrUdEtV8bm0m80cLhFUaJUZ5rdLE6DuLd81R01QCBQ5Dt8 USGg== X-Gm-Message-State: AKS2vOz1r8b8g+/CnO18NBURqgI0KEuTDJbxWsKfjfLE4oYmexDvc/zo qkhqOw7nyvNc/X/i X-Received: by 10.223.132.133 with SMTP id 5mr14453123wrg.132.1499089947383; Mon, 03 Jul 2017 06:52:27 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id v102sm3185905wrc.53.2017.07.03.06.52.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2017 06:52:26 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <868tk5ogwe.fsf@gmail.com> Date: Mon, 03 Jul 2017 15:52:31 +0200 Message-ID: <867ezpocf4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) --=-=-= Content-Type: text/plain > Anyway the (guix git) binding is almost ready, I'll send a patch soon. Here it is ! Mathieu --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-base-Use-guix-git-module.patch >From 37d7b68c1e89a2873673613f4781efb6acda529b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 1 Jul 2017 12:29:59 +0200 Subject: [PATCH] base: Use (guix git) module. * src/cuirass/base.scm (copy-repository-cache) : New procedure. (fetch-repository): Use latest-repository-commit to fetch git repository instead of raw git system commands. (process-specs): Use fetch-repository to get a store directory containing the repository described in SPEC, add copy it to cache with "copy-repository-cache". --- src/cuirass/base.scm | 99 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 42 deletions(-) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index 58f2be3..24b4769 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -24,10 +24,12 @@ #:use-module (guix build utils) #:use-module (guix derivations) #:use-module (guix store) + #:use-module (guix git) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) + #:use-module (ice-9 receive) #:use-module (srfi srfi-19) #:use-module (srfi srfi-34) #:export (;; Procedures. @@ -77,33 +79,42 @@ values." duration) (acons #:duration duration result))))) -(define (fetch-repository spec) - "Get the latest version of repository specified in SPEC. Clone repository -if required. Return the last commit ID on success, #f otherwise." - (define (current-commit) - (let* ((pipe (open-input-pipe "git log -n1")) - (log (read-string pipe)) - (commit (cadr (string-split log char-set:whitespace)))) - (close-pipe pipe) - commit)) - +(define (fetch-repository store spec) + "Get the latest version of repository specified in SPEC. Return two +values: the content of the git repository at URL copied into a store +directory and the sha1 of the top level commit in this directory." + + (define (add-origin branch) + "Prefix branch name with origin if no remote is specified." + (if (string-index branch #\/) + branch + (string-append "origin/" branch))) + + (let ((name (assq-ref spec #:name)) + (url (assq-ref spec #:url)) + (branch (and=> (assq-ref spec #:branch) + (lambda (b) + `(branch . ,(add-origin b))))) + (commit (and=> (assq-ref spec #:commit) + (lambda (c) + `(commit . ,c)))) + (tag (and=> (assq-ref spec #:tag) + (lambda (t) + `(tag . ,t))))) + (latest-repository-commit store url + #:cache-directory (%package-cachedir) + #:ref (pk (or branch commit tag))))) + +(define (copy-repository-cache repo spec) + "Copy REPO directory in cache. The directory is named after NAME + field in SPEC." (let ((cachedir (%package-cachedir))) (mkdir-p cachedir) (with-directory-excursion cachedir - (let ((name (assq-ref spec #:name)) - (url (assq-ref spec #:url)) - (branch (assq-ref spec #:branch)) - (commit (assq-ref spec #:commit)) - (tag (assq-ref spec #:tag))) - (and (or (file-exists? name) - (zero? (system* "git" "clone" url name))) - (with-directory-excursion name - (and (zero? (system* "git" "fetch")) - (zero? (system* "git" "reset" "--hard" - (or tag - commit - (string-append "origin/" branch)))) - (current-commit)))))))) + (let ((name (assq-ref spec #:name))) + ;; Flush any directory with the same name. + (false-if-exception (delete-file-recursively name)) + (copy-recursively repo name))))) (define (compile dir) ;; Required for fetching Guix bootstrap tarballs. @@ -127,6 +138,7 @@ if required. Return the last commit ID on success, #f otherwise." (%package-database))) (jobs (read port))) (close-pipe port) + ;; XXX: test if jobs is consistent. jobs)) (define (build-packages store db jobs) @@ -171,24 +183,27 @@ if required. Return the last commit ID on success, #f otherwise." (define (process-specs db jobspecs) "Evaluate and build JOBSPECS and store results in DB." (define (process spec) - (let ((commit (fetch-repository spec)) - (stamp (db-get-stamp db spec))) - (when commit - (unless (string=? commit stamp) - (unless (assq-ref spec #:no-compile?) - (compile (string-append (%package-cachedir) "/" - (assq-ref spec #:name)))) - (with-store store - ;; Always set #:keep-going? so we don't stop on the first build - ;; failure. - (set-build-options store - #:use-substitutes? (%use-substitutes?) - #:keep-going? #t) - - (let* ((spec* (acons #:current-commit commit spec)) - (jobs (evaluate store db spec*))) - (build-packages store db jobs)))) - (db-add-stamp db spec commit)))) + (with-store store + (let ((stamp (db-get-stamp db spec))) + (receive (store-dir commit) + (fetch-repository store spec) + (when commit + (unless (string=? commit stamp) + (copy-repository-cache store-dir spec) + + (unless (assq-ref spec #:no-compile?) + (compile (string-append (%package-cachedir) "/" + (assq-ref spec #:name)))) + ;; Always set #:keep-going? so we don't stop on the first build + ;; failure. + (set-build-options store + #:use-substitutes? (%use-substitutes?) + #:keep-going? #t) + + (let* ((spec* (acons #:current-commit commit spec)) + (jobs (evaluate store db spec*))) + (build-packages store db jobs))) + (db-add-stamp db spec commit)))))) (for-each process jobspecs)) -- 2.13.1 --=-=-=-- From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2017 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149909130315925 (code B ref 27550); Mon, 03 Jul 2017 14:16:02 +0000 Received: (at 27550) by debbugs.gnu.org; 3 Jul 2017 14:15:03 +0000 Received: from localhost ([127.0.0.1]:50435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS27z-00048V-0b for submit@debbugs.gnu.org; Mon, 03 Jul 2017 10:15:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS27x-00046p-K1 for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 10:15:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS27o-0003SF-Gm for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 10:14:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS27o-0003S9-CE; Mon, 03 Jul 2017 10:14:52 -0400 Received: from [193.50.110.99] (port=58306 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dS27n-0005vn-R4; Mon, 03 Jul 2017 10:14:52 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Messidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Mon, 03 Jul 2017 16:14:48 +0200 In-Reply-To: <868tk5ogwe.fsf@gmail.com> (Mathieu Othacehe's message of "Mon, 03 Jul 2017 14:15:45 +0200") Message-ID: <87eftxppyf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -7.8 (-------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -7.8 (-------) Mathieu Othacehe skribis: >> What about instead coming up with a single patch that replaces >> =E2=80=98git-repo=E2=80=99 with its Guile-Git counterpart? The removal = of unused >> procedures can come separately, or along with this patch. > > I got your point but unless I'm wrong git-repo is not used in > cuirass. So removing it does not have any functional impact on Cuirass. Oh sorry, I thought it was relied on. In that case you can go ahead with this patch; likewise for the second patch if all these procedures are already unused. Ludo=E2=80=99. From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2017 14:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149909209424068 (code B ref 27550); Mon, 03 Jul 2017 14:29:02 +0000 Received: (at 27550) by debbugs.gnu.org; 3 Jul 2017 14:28:14 +0000 Received: from localhost ([127.0.0.1]:50458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS2Kk-0006G8-7h for submit@debbugs.gnu.org; Mon, 03 Jul 2017 10:28:14 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:36427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dS2Ki-0006Fu-2q for 27550@debbugs.gnu.org; Mon, 03 Jul 2017 10:28:12 -0400 Received: by mail-wr0-f173.google.com with SMTP id c11so235438810wrc.3 for <27550@debbugs.gnu.org>; Mon, 03 Jul 2017 07:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=RheeJXp6Do+g/V5sA1X8WyDTRdFWbtdIC9D0x2SGe/k=; b=ekNIzfjY2BxAAISmPmzVVNObkoJYTnzKFWBp7CmO5Azh2acrSoIc2zYkamwCCMcqTi 5GHdK6l5WmHEXshq4sY1G6rlcV451JY8qaU9DR9Nj6u3qqF6oaFPBSgqmGdB/ZmWWTZg jQX4uwh3yW+Sb9KDTinSb9caNzpR3KlBgL94xHWKGCNhJb51Sap5ialIapoW00jd+wFT fo63+gAuZgPthPEf6LgbqwKl40SacH3sJM1ZOJczXlzFrHzm1DVy7C70PnxwLToJuVjj fLkhvodZ+cq/taiM0jdJqjpbypTd1Bzv+kmOgndXYyO1rwqgZU3dw7eOIxUj+v9+XCvz azkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=RheeJXp6Do+g/V5sA1X8WyDTRdFWbtdIC9D0x2SGe/k=; b=LRaKhi8TTrJ+Dj1E6IdnccVC5sRKjBtToL2zK8UrNuYXq1oC6NopPFYVbWVESj2gO2 O4onAYNv/gK5oGLp9dimt7wQ6iyOFZk8Nc83MRkuJ7367qTtUB1DsnpCr/p5oYj5Cl1X Dh5qe8zva+s4a+fdt2nzE7uqFU4NDRPR/EgErb2Ca4e21gKMhNN8NCRU9bdZbPz5BIym a3HPra+rVy3P6KxfL97PFdf+ttEodFEtoQeVPdobVJrlnDmEi56CU89Z/qmuVvDSBr8m xh8bcnQy36DET1HMmXtX5GASoSbrpQyRGkljXditVwz4VrpHOp4KlYKylr+PAEprCUye VtJg== X-Gm-Message-State: AKS2vOySrWQmamLvq6qj29H0ok49m7IEYOs2oDQhFYr1DipB33ocKR6X kFWaDdlk4CPSRD+Z X-Received: by 10.223.164.151 with SMTP id g23mr35841740wrb.174.1499092086166; Mon, 03 Jul 2017 07:28:06 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id z99sm17315771wrc.12.2017.07.03.07.28.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2017 07:28:05 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <87eftxppyf.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <87eftxppyf.fsf@gnu.org> Date: Mon, 03 Jul 2017 16:28:10 +0200 Message-ID: <8660f9oarp.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) > Oh sorry, I thought it was relied on. In that case you can go ahead > with this patch; likewise for the second patch if all these procedures > are already unused. No problem, just pushed them both ! Thanks, Mathieu From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2017 21:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149920397222828 (code B ref 27550); Tue, 04 Jul 2017 21:33:02 +0000 Received: (at 27550) by debbugs.gnu.org; 4 Jul 2017 21:32:52 +0000 Received: from localhost ([127.0.0.1]:52568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSVRE-0005w8-0L for submit@debbugs.gnu.org; Tue, 04 Jul 2017 17:32:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSVRC-0005vv-3q for 27550@debbugs.gnu.org; Tue, 04 Jul 2017 17:32:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSVR3-0004cz-11 for 27550@debbugs.gnu.org; Tue, 04 Jul 2017 17:32:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSVR2-0004cs-UI; Tue, 04 Jul 2017 17:32:40 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40180 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dSVR2-00005R-9m; Tue, 04 Jul 2017 17:32:40 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 16 Messidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Tue, 04 Jul 2017 23:32:37 +0200 In-Reply-To: <867ezpocf4.fsf@gmail.com> (Mathieu Othacehe's message of "Mon, 03 Jul 2017 15:52:31 +0200") Message-ID: <87o9szsxai.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Mathieu, Mathieu Othacehe skribis: > From 37d7b68c1e89a2873673613f4781efb6acda529b Mon Sep 17 00:00:00 2001 > From: Mathieu Othacehe > Date: Sat, 1 Jul 2017 12:29:59 +0200 > Subject: [PATCH] base: Use (guix git) module. > > * src/cuirass/base.scm (copy-repository-cache) : New procedure. > (fetch-repository): Use latest-repository-commit to fetch git > repository instead of raw git system commands. > (process-specs): Use fetch-repository to get a store directory > containing the repository described in SPEC, add copy it to cache with > "copy-repository-cache". Looks nice! > +(define (fetch-repository store spec) > + "Get the latest version of repository specified in SPEC. Return two > +values: the content of the git repository at URL copied into a store > +directory and the sha1 of the top level commit in this directory." > + > + (define (add-origin branch) > + "Prefix branch name with origin if no remote is specified." > + (if (string-index branch #\/) > + branch > + (string-append "origin/" branch))) > + > + (let ((name (assq-ref spec #:name)) > + (url (assq-ref spec #:url)) > + (branch (and=3D> (assq-ref spec #:branch) > + (lambda (b) > + `(branch . ,(add-origin b))))) > + (commit (and=3D> (assq-ref spec #:commit) > + (lambda (c) > + `(commit . ,c)))) > + (tag (and=3D> (assq-ref spec #:tag) > + (lambda (t) > + `(tag . ,t))))) > + (latest-repository-commit store url > + #:cache-directory (%package-cachedir) > + #:ref (pk (or branch commit tag))))) Leftover =E2=80=98pk=E2=80=99. :-) > + (with-store store > + (let ((stamp (db-get-stamp db spec))) > + (receive (store-dir commit) > + (fetch-repository store spec) Maybe s/store-dir/checkout/ for clarity. Please add a check for (guix git) in configure.ac. Now there are =E2=80=98git-error=E2=80=99 exception that can be thrown from= there. Should the =E2=80=98cuirass=E2=80=99 program catch them, report them on std= err, and keep going? Maybe we can ignore that for now (throwing is better than silently ignoring Git problems anyway.) Thanks, Ludo=E2=80=99. From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2017 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149924053721354 (code B ref 27550); Wed, 05 Jul 2017 07:43:02 +0000 Received: (at 27550) by debbugs.gnu.org; 5 Jul 2017 07:42:17 +0000 Received: from localhost ([127.0.0.1]:52868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSewz-0005YM-52 for submit@debbugs.gnu.org; Wed, 05 Jul 2017 03:42:17 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSewx-0005Y9-L6 for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 03:42:16 -0400 Received: by mail-wm0-f49.google.com with SMTP id f67so103481884wmh.1 for <27550@debbugs.gnu.org>; Wed, 05 Jul 2017 00:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=OfpE5pnkRPA2lYdVKDQDxk+X2tca0JI7uE2k8gPeXGw=; b=MSp4qAgrXwxewezVcrtRUnvy8WaPxEdnyuMHBqe24u3Zj9uP81lkA5p+mfUOan8Oad LsnLDEVKs6aHAXCa0PLh06jtw2tI3JVWAag07U7q9h/m/pQXQ16xjfXhrIvUd2HUGIP1 UckNn5O4P9GC4MJNyKGis36DM8FZiABf6glVtRNOW0FMGaqQgg7tPVfZospFIM4fu766 3vJM1otPA6C0IYOZ2xa0ONWf8lyJeztKsJd5zF4Xxbo5hWOp2F367nWjHiRMs2UCoUnI p/9NculbOjBIgZ1Lq+qJeq7DkGnwzf/u8jib2SaX5Gctj/Xd2MSf6STx+90azI8nhWUV SNMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=OfpE5pnkRPA2lYdVKDQDxk+X2tca0JI7uE2k8gPeXGw=; b=j4+AjDNuBo1q3rTF8SfgOmYwVYLv6ZbCpol6j7nCWqBCApK0qxZO44We5lHwhN5MYP /L9KM+2wBz2XtpsLmdItxe0JGkeZqWMArdWiNu6lbIHg/n7obNg0OGzniwhrKEXJJUks oKfl5A0bWEsBN9osbWWYfXaE394SyLLdhvhheUiFwM04J2HDBaIMmf2BCnWQXrBdnAFy 70HEyOy+WyqhHDIF3Wv5Hs19dIsnqXJBo5a2oMi59BJbMFM1qYxqzeMFGri5VZ9n68Ik hqdklCraEzEFcW/T/FRHvsrywisE74fjevYi7e8WQ9feFYLf2/VMHj1PvQBmT8qsmRwJ e+2Q== X-Gm-Message-State: AKS2vOyb0h+KU5UttEjL3QXRW8AxYKl5gsZva9JFWUJAGKKVtZyJeO6c JGLTo3t+NDmUrouL X-Received: by 10.28.1.8 with SMTP id 8mr20596300wmb.88.1499240529740; Wed, 05 Jul 2017 00:42:09 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id c27sm18045565wrb.44.2017.07.05.00.42.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jul 2017 00:42:09 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> <87o9szsxai.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <87o9szsxai.fsf@gnu.org> Date: Wed, 05 Jul 2017 09:42:13 +0200 Message-ID: <864lurnxd6.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi Ludo, > Looks nice! Thanks :) > Leftover ‘pk’. :-) Oops ! > > Maybe s/store-dir/checkout/ for clarity. > > Please add a check for (guix git) in configure.ac. Ok. > > Now there are ‘git-error’ exception that can be thrown from there. > Should the ‘cuirass’ program catch them, report them on stderr, and keep > going? Maybe we can ignore that for now (throwing is better than > silently ignoring Git problems anyway.) Maybe we can ignore them for now, and when guile-git will support git-error integer error code -> string conversion, we can report them and keep going as you suggested ? Mathieu From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2017 11:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149925565017794 (code B ref 27550); Wed, 05 Jul 2017 11:55:02 +0000 Received: (at 27550) by debbugs.gnu.org; 5 Jul 2017 11:54:10 +0000 Received: from localhost ([127.0.0.1]:53023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSisj-0004cw-W7 for submit@debbugs.gnu.org; Wed, 05 Jul 2017 07:54:10 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSish-0004cj-MH for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 07:54:08 -0400 Received: by mail-wm0-f49.google.com with SMTP id i127so164093582wma.0 for <27550@debbugs.gnu.org>; Wed, 05 Jul 2017 04:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=yNXx1hubVjxgBYGXXT0GB6z8/alzptSDdZqI7H1iYGs=; b=ao071CP0YwztJ/U6FC0dumeVQ6LVGlFPMXyCLLqcBQBxuBfHGWGQdd5bAu+xN+X5zn DrhBBTA4Xyr/JVRQX2jnuJF0bQpJTji5/zeBIu/R8/5XzcFS1sYxcrpZlcXmTr+6lm5X +VMCNIYfZtEre1HoYNAzHNzMcQj0/Hysx8YY41BQinIO08LRE5Q5fsQ9Y3xA4P6SYQly HPNbW3Lwbw1HwNy9eAMP2SxXIE0FvAgYwJdVP5Yf6KkU6DVVqu53y14Z550r+ZkJaoPu 9Eaa/ID15+OYG5pywhzH4qqGC1trfmbfL9tPhUVe7yAocT4PzpaQ3HocFMs01UITg4J9 G4kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=yNXx1hubVjxgBYGXXT0GB6z8/alzptSDdZqI7H1iYGs=; b=ZsbqcggeVZguTauGwsLY6V6Dl/su215CFwkWFD+PLqUB5yr57gYotzJ7C7iUAsAjcv OzEGKPVrWi1dkrr1ZVS/j3SDmu+IQ2Ci4uhUTq3flpV4hr4xo1b63r/3QVZMP1x9xYA/ WtGIY4kOhcs3afqcSbMQJC2hxWg6i2i34PEWVIGni+AdSF+oTJg2CY4AOYfkWFtfqAAq xfR4JE6AZt7DYKY7oEJFaC3IsWy2grHMfw7nfy5og2p//v72aoIVj7SUEsC2hp01/j5E VHGgE06tNadNhxczDdvpULETaG/YXm6cVz93fKmIeUSog/l66eGTZrxcovUx2+LZ1MaV xIpA== X-Gm-Message-State: AIVw110UrYi9t5nb1LpNPQOumMLFtnZDaBDQf9U9sJIJpOS/JkxIrK36 Ypc8PzGWNDJutTWW X-Received: by 10.28.141.142 with SMTP id p136mr18762309wmd.125.1499255641688; Wed, 05 Jul 2017 04:54:01 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id u62sm18235292wmd.5.2017.07.05.04.54.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jul 2017 04:54:00 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> <87o9szsxai.fsf@gnu.org> <864lurnxd6.fsf@gmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <864lurnxd6.fsf@gmail.com> Date: Wed, 05 Jul 2017 13:54:05 +0200 Message-ID: <8637abnlpe.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain Here's the v2. Thanks, Mathieu --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-base-Use-guix-git-module.patch >From 1b79b7bf6e3ce864582b9aa79877b591798852ef Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 1 Jul 2017 12:29:59 +0200 Subject: [PATCH] base: Use (guix git) module. * src/cuirass/base.scm (copy-repository-cache) : New procedure. (fetch-repository): Use latest-repository-commit to fetch git repository instead of raw git system commands. (process-specs): Use fetch-repository to get a store directory containing the repository described in SPEC, add copy it to cache with "copy-repository-cache". * configure.ac: Check (guix git) module presence. --- configure.ac | 1 + src/cuirass/base.scm | 98 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 42 deletions(-) diff --git a/configure.ac b/configure.ac index 640e0c3..d7f111c 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ AS_IF([test -z "$ac_cv_path_GUILD"], [AC_MSG_ERROR(['guild' program cannot be found.])]) GUILE_MODULE_REQUIRED([guix]) +GUILE_MODULE_REQUIRED([guix git]) GUILE_MODULE_REQUIRED([json]) GUILE_MODULE_REQUIRED([sqlite3]) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index 58f2be3..1d15747 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -24,10 +24,12 @@ #:use-module (guix build utils) #:use-module (guix derivations) #:use-module (guix store) + #:use-module (guix git) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) + #:use-module (ice-9 receive) #:use-module (srfi srfi-19) #:use-module (srfi srfi-34) #:export (;; Procedures. @@ -77,33 +79,42 @@ values." duration) (acons #:duration duration result))))) -(define (fetch-repository spec) - "Get the latest version of repository specified in SPEC. Clone repository -if required. Return the last commit ID on success, #f otherwise." - (define (current-commit) - (let* ((pipe (open-input-pipe "git log -n1")) - (log (read-string pipe)) - (commit (cadr (string-split log char-set:whitespace)))) - (close-pipe pipe) - commit)) - +(define (fetch-repository store spec) + "Get the latest version of repository specified in SPEC. Return two +values: the content of the git repository at URL copied into a store +directory and the sha1 of the top level commit in this directory." + + (define (add-origin branch) + "Prefix branch name with origin if no remote is specified." + (if (string-index branch #\/) + branch + (string-append "origin/" branch))) + + (let ((name (assq-ref spec #:name)) + (url (assq-ref spec #:url)) + (branch (and=> (assq-ref spec #:branch) + (lambda (b) + `(branch . ,(add-origin b))))) + (commit (and=> (assq-ref spec #:commit) + (lambda (c) + `(commit . ,c)))) + (tag (and=> (assq-ref spec #:tag) + (lambda (t) + `(tag . ,t))))) + (latest-repository-commit store url + #:cache-directory (%package-cachedir) + #:ref (or branch commit tag)))) + +(define (copy-repository-cache repo spec) + "Copy REPO directory in cache. The directory is named after NAME + field in SPEC." (let ((cachedir (%package-cachedir))) (mkdir-p cachedir) (with-directory-excursion cachedir - (let ((name (assq-ref spec #:name)) - (url (assq-ref spec #:url)) - (branch (assq-ref spec #:branch)) - (commit (assq-ref spec #:commit)) - (tag (assq-ref spec #:tag))) - (and (or (file-exists? name) - (zero? (system* "git" "clone" url name))) - (with-directory-excursion name - (and (zero? (system* "git" "fetch")) - (zero? (system* "git" "reset" "--hard" - (or tag - commit - (string-append "origin/" branch)))) - (current-commit)))))))) + (let ((name (assq-ref spec #:name))) + ;; Flush any directory with the same name. + (false-if-exception (delete-file-recursively name)) + (copy-recursively repo name))))) (define (compile dir) ;; Required for fetching Guix bootstrap tarballs. @@ -171,24 +182,27 @@ if required. Return the last commit ID on success, #f otherwise." (define (process-specs db jobspecs) "Evaluate and build JOBSPECS and store results in DB." (define (process spec) - (let ((commit (fetch-repository spec)) - (stamp (db-get-stamp db spec))) - (when commit - (unless (string=? commit stamp) - (unless (assq-ref spec #:no-compile?) - (compile (string-append (%package-cachedir) "/" - (assq-ref spec #:name)))) - (with-store store - ;; Always set #:keep-going? so we don't stop on the first build - ;; failure. - (set-build-options store - #:use-substitutes? (%use-substitutes?) - #:keep-going? #t) - - (let* ((spec* (acons #:current-commit commit spec)) - (jobs (evaluate store db spec*))) - (build-packages store db jobs)))) - (db-add-stamp db spec commit)))) + (with-store store + (let ((stamp (db-get-stamp db spec))) + (receive (checkout commit) + (fetch-repository store spec) + (when commit + (unless (string=? commit stamp) + (copy-repository-cache checkout spec) + + (unless (assq-ref spec #:no-compile?) + (compile (string-append (%package-cachedir) "/" + (assq-ref spec #:name)))) + ;; Always set #:keep-going? so we don't stop on the first build + ;; failure. + (set-build-options store + #:use-substitutes? (%use-substitutes?) + #:keep-going? #t) + + (let* ((spec* (acons #:current-commit commit spec)) + (jobs (evaluate store db spec*))) + (build-packages store db jobs))) + (db-add-stamp db spec commit)))))) (for-each process jobspecs)) -- 2.13.1 --=-=-=-- From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2017 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149929106225679 (code B ref 27550); Wed, 05 Jul 2017 21:45:02 +0000 Received: (at 27550) by debbugs.gnu.org; 5 Jul 2017 21:44:22 +0000 Received: from localhost ([127.0.0.1]:53824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSs5t-0006g7-FO for submit@debbugs.gnu.org; Wed, 05 Jul 2017 17:44:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSs5s-0006fv-57 for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 17:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSs5j-0000PB-HC for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 17:44:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSs5j-0000P5-Db; Wed, 05 Jul 2017 17:44:11 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:42178 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dSs5i-0003sv-QM; Wed, 05 Jul 2017 17:44:11 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> <87o9szsxai.fsf@gnu.org> <864lurnxd6.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 17 Messidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 05 Jul 2017 23:44:07 +0200 In-Reply-To: <864lurnxd6.fsf@gmail.com> (Mathieu Othacehe's message of "Wed, 05 Jul 2017 09:42:13 +0200") Message-ID: <87fueasgns.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hello, Mathieu Othacehe skribis: >> Looks nice! > > Thanks :) > >> Leftover =E2=80=98pk=E2=80=99. :-) > > Oops ! > >> >> Maybe s/store-dir/checkout/ for clarity. >> >> Please add a check for (guix git) in configure.ac. > > Ok. > >> >> Now there are =E2=80=98git-error=E2=80=99 exception that can be thrown f= rom there. >> Should the =E2=80=98cuirass=E2=80=99 program catch them, report them on = stderr, and keep >> going? Maybe we can ignore that for now (throwing is better than >> silently ignoring Git problems anyway.) > > Maybe we can ignore them for now, and when guile-git will support > git-error integer error code -> string conversion, we can report them > and keep going as you suggested ? Sure, sounds good, let=E2=80=99s ignore this for now. Thank you! Ludo=E2=80=99. From unknown Tue Aug 19 03:05:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2017 21:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 27550@debbugs.gnu.org Received: via spool by 27550-submit@debbugs.gnu.org id=B27550.149929114525816 (code B ref 27550); Wed, 05 Jul 2017 21:46:01 +0000 Received: (at 27550) by debbugs.gnu.org; 5 Jul 2017 21:45:45 +0000 Received: from localhost ([127.0.0.1]:53828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSs7F-0006iK-2L for submit@debbugs.gnu.org; Wed, 05 Jul 2017 17:45:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSs7D-0006i8-Op for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 17:45:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSs76-00013r-2D for 27550@debbugs.gnu.org; Wed, 05 Jul 2017 17:45:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSs75-00013l-Tz; Wed, 05 Jul 2017 17:45:35 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:42180 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dSs75-0003z9-90; Wed, 05 Jul 2017 17:45:35 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> <87o9szsxai.fsf@gnu.org> <864lurnxd6.fsf@gmail.com> <8637abnlpe.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 17 Messidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 05 Jul 2017 23:45:33 +0200 In-Reply-To: <8637abnlpe.fsf@gmail.com> (Mathieu Othacehe's message of "Wed, 05 Jul 2017 13:54:05 +0200") Message-ID: <87bmoysgle.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mathieu Othacehe skribis: > From 1b79b7bf6e3ce864582b9aa79877b591798852ef Mon Sep 17 00:00:00 2001 > From: Mathieu Othacehe > Date: Sat, 1 Jul 2017 12:29:59 +0200 > Subject: [PATCH] base: Use (guix git) module. > > * src/cuirass/base.scm (copy-repository-cache) : New procedure. > (fetch-repository): Use latest-repository-commit to fetch git > repository instead of raw git system commands. > (process-specs): Use fetch-repository to get a store directory > containing the repository described in SPEC, add copy it to cache with > "copy-repository-cache". > * configure.ac: Check (guix git) module presence. OK! Ludo'. From unknown Tue Aug 19 03:05:15 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Mathieu Othacehe Subject: bug#27550: closed (Re: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration.) Message-ID: References: <861spunj7t.fsf@gmail.com> <20170701150043.14654-1-m.othacehe@gmail.com> X-Gnu-PR-Message: they-closed 27550 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 27550@debbugs.gnu.org Date: Thu, 06 Jul 2017 07:01:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1499324462-31264-1" This is a multi-part message in MIME format... ------------=_1499324462-31264-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #27550: [PATCH 0/2] cuirass: Prepare (guix git) integration. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 27550@debbugs.gnu.org. --=20 27550: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D27550 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1499324462-31264-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 27550-done) by debbugs.gnu.org; 6 Jul 2017 07:00:11 +0000 Received: from localhost ([127.0.0.1]:54124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dT0ln-000877-5f for submit@debbugs.gnu.org; Thu, 06 Jul 2017 03:00:11 -0400 Received: from mail-wr0-f180.google.com ([209.85.128.180]:33097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dT0ll-000865-PJ for 27550-done@debbugs.gnu.org; Thu, 06 Jul 2017 03:00:10 -0400 Received: by mail-wr0-f180.google.com with SMTP id r103so15375981wrb.0 for <27550-done@debbugs.gnu.org>; Thu, 06 Jul 2017 00:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=Ocbo9tkCsS+HkrDS2nk5sbttyywXUYXHBGm0Ef6dJZg=; b=kH/rTmB+PemseVhNtjuIfPNwR5IIdwx95gdkCIRL6e+DsYfhSi0ZpCU1ttT8ZXxSCv iLBOUG0sLSBCU1j7ocRe8L6xW7cdQwyS23QFFqR/3qVrJzX+JdlSBnJ2azswd6Vhda31 SDbl+IijFDjN2722TQCDGM6nfTCheFzzYSQq8/TCljLAInsgtlPthrwY47LCuG0Bfm5T VFQ/CSn0UJbC8yGIs+ePgqsmYftP12Ht3dMQHACND/q0CA3GW20cbeU0lSkejb1tuDLy /RJ9a2CD/AuNYL8VP9OGkOnMNM7Eyz5eqnfdIHp4UIx0RIezLxn7koJm68baUuxNmmwG e5ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=Ocbo9tkCsS+HkrDS2nk5sbttyywXUYXHBGm0Ef6dJZg=; b=SpUBYVeROil05G3iP+VbFHigOvW96Xjjgy9ug545ChG6hW9Eh2q7ErwGa5TzyXIanv A1dk/qV3TI7jC1JXutfoq64OouQANybeKzttCPyQdkGR96+igVIWa1FQ6jyjsxy1CtQk ZKnnbJOTqfFgo0uEtW2hSQrvP3PXbnq5cwx2t7MI1VdRp2lf1AEUjgQY8ARgKCYKNdTl LJBuicpD8E35+C3OuY+TiDttEBxuaV8D8ZlziQzGlcIJC270uqKwwRQEmrNZ5AjHRTCm D97WGyDXNXh08pJ1z4rF4irNMVFKPHRqdpoRLM+LzCmnK+hnDGlpOiguCUpi3RsrvzJn VQcA== X-Gm-Message-State: AKS2vOxvAuCk/8hnL+SUflQ8dgMRs4n1HvNx/Q1L3Yz5QkfRWIcZQm4S 4Ftzkv124Vc9lkCm X-Received: by 10.28.168.145 with SMTP id r139mr24453600wme.102.1499324403357; Thu, 06 Jul 2017 00:00:03 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id l70sm23106924wmd.3.2017.07.06.00.00.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Jul 2017 00:00:02 -0700 (PDT) References: <20170701150043.14654-1-m.othacehe@gmail.com> <87inj9pvvf.fsf@gnu.org> <868tk5ogwe.fsf@gmail.com> <867ezpocf4.fsf@gmail.com> <87o9szsxai.fsf@gnu.org> <864lurnxd6.fsf@gmail.com> <8637abnlpe.fsf@gmail.com> <87bmoysgle.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#27550] [PATCH 0/2] cuirass: Prepare (guix git) integration. In-reply-to: <87bmoysgle.fsf@gnu.org> Date: Thu, 06 Jul 2017 09:00:06 +0200 Message-ID: <861spunj7t.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27550-done Cc: 27550-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Pushed as 1b79b7b, Thanks, Mathieu ------------=_1499324462-31264-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 Jul 2017 15:01:11 +0000 Received: from localhost ([127.0.0.1]:47828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJtX-0008K0-Lm for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJtW-0008Jo-51 for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJtP-0003q3-SH for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRJtP-0003pw-Pf for submit@debbugs.gnu.org; Sat, 01 Jul 2017 11:01:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRJtO-0003qy-Rf for guix-patches@gnu.org; Sat, 01 Jul 2017 11:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJtK-0003iX-0v for guix-patches@gnu.org; Sat, 01 Jul 2017 11:01:02 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dRJtJ-0003hj-Pr for guix-patches@gnu.org; Sat, 01 Jul 2017 11:00:57 -0400 Received: by mail-wr0-x243.google.com with SMTP id 77so41232126wrb.3 for ; Sat, 01 Jul 2017 08:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mTslogMU8eU0p/I5KydWXjbDFA2olYkTIyfT96folls=; b=DzD/pRio0LaqUizmP5Ma2CJlrb7SAMII7DXLchWd4+2cPuXjlNx5S5TujT7j/9lqPc lsvFmMPwmjXAI36peTQdbnmHwzqbjmzRlPqsScu6DpyVijUn6Kg3vhzUD3fVl/im41Z8 /1WqfuMWCGbsx8bY7vPqyebhN7hIQH97ew6yt6kG+VULMD3BRGZDQ2Sq+AyngLfTHIMz gawHvWvZp5SFCJ52+07ICR2Ubmh07NpPRH+t46CP0zr+Yzs4N8HmrrRqBGMyU+lgMxLO jHabkHOAtfXYg3T17My3GT/H1xcvpCyD/UDxyd0thGaZ1FteFyrWRE2xTBz5AJbzDh3Y 8k+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mTslogMU8eU0p/I5KydWXjbDFA2olYkTIyfT96folls=; b=mqsf45plCEs7dmReVi5vjF7BZ0VNkdAfpibicnkFfsQVTLjt6+vvHO9YLxjx2TT/Lg tnn+PY9c+OjvECmJ46uhqnDvduVDC14tmdklylMyynGWMEuFKD7VK5hcy51hkC3JPmSQ VqNiQlnqhr4VOxtllY67eNk1lGsQ9gKYGNwi8A+pVCwn8E6bBU9f/TVs9C0/gLRh8PQP j0bgRbXVaVOdNZQ03OJNhGkSTyrLENvzYykUS6LQehYVRk4HpbbU5T6MifFNgYpPrwNY iqjnlT2NGbLSFmLav03I+JHmRNX67mR6cYAneINVxXSNWr7Z31/2DxON7b9Za7QHRd+l D/vQ== X-Gm-Message-State: AKS2vOyTKcvvmd31jyRGHkHkfMmZ1RKdH/ZlQP0BwG8kGSxvPmLYtqF6 fpN1RSRRV2mnDo97 X-Received: by 10.223.173.143 with SMTP id w15mr26788957wrc.113.1498921256345; Sat, 01 Jul 2017 08:00:56 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id x131sm4610605wmg.13.2017.07.01.08.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 08:00:55 -0700 (PDT) From: Mathieu Othacehe To: guix-patches@gnu.org Subject: [PATCH 0/2] cuirass: Prepare (guix git) integration. Date: Sat, 1 Jul 2017 17:00:43 +0200 Message-Id: <20170701150043.14654-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -6.8 (------) X-Debbugs-Envelope-To: submit Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.8 (------) Hi, Here are two patches to remove useless/duplicated stuff from cuirass and prepare (guix git) integration. Thanks, Mathieu Mathieu Othacehe (2): repo: remove git-repo. utils: Remove useless procedures. bin/cuirass.in | 4 +-- bin/evaluate.in | 2 +- src/cuirass/base.scm | 2 +- src/cuirass/repo.scm | 38 +--------------------------- src/cuirass/utils.scm | 69 +-------------------------------------------------- tests/repo.scm | 32 ------------------------ tests/utils.scm | 15 ----------- 7 files changed, 6 insertions(+), 156 deletions(-) -- 2.13.1 ------------=_1499324462-31264-1--