From patchwork Sun Sep 1 13:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 30511 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 E343627BBEA; Sun, 1 Sep 2024 14:56:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E71727BBE2 for ; Sun, 1 Sep 2024 14:56:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1skl3q-0006tL-Hj; Sun, 01 Sep 2024 09:56:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1skl3o-0006rz-3e for guix-patches@gnu.org; Sun, 01 Sep 2024 09:56:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1skl3m-0007O9-UP; Sun, 01 Sep 2024 09:56:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=SmiWmgU6ty0kdW1F+b+Vo4eWzeLW0Us70LynrniUFD0=; b=TxwKp04skM9HkOlved7+9HRULduxuxE5JsO+BLZiHX4/uzo/5jQ0Akb9cfVh+Zg9BJinZh5b7fOGDUKSuXnKH8/YQvCpvF0Gq7hbg7iqZBeu4gBiER9EVp4o3bPUqOUGh7WahSQwHLN2E4sK3oVfaEaBA/QeMTfuc8ztMIkk7c8Y2TAI4A14XYTq8tZNLmB7By/buqrhxsqkje09OxR7XmXmMEi8WVI7NmFVTnrqVaocUC3m+xefWd4mAdRQqiTr/o3S/xyIcIf3KQPei3X6IFQ4m2+DxHRiJbXFXRafTa6ZFlbhfbvFXQTSnDcovtRLnuBht+UdXui+hrbdWU3iVg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1skl4g-0000aL-GT; Sun, 01 Sep 2024 09:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72928] [PATCH] time-machine: Print profile path if no command is given. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 01 Sep 2024 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72928@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.17251989732216 (code B ref -1); Sun, 01 Sep 2024 13:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Sep 2024 13:56:13 +0000 Received: from localhost ([127.0.0.1]:35669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skl3s-0000Zg-Ic for submit@debbugs.gnu.org; Sun, 01 Sep 2024 09:56:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:44128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1skl3q-0000Za-KS for submit@debbugs.gnu.org; Sun, 01 Sep 2024 09:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1skl2s-0006eh-LG for guix-patches@gnu.org; Sun, 01 Sep 2024 09:55:10 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1skl2q-0007IT-E1 for guix-patches@gnu.org; Sun, 01 Sep 2024 09:55:10 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 4664126E8DB; Sun, 1 Sep 2024 13:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1725198905; bh=Nz8kKS943NHoVmE9IU+7u/5WuLij5oPE28A/GmrKIZI=; h=From:To:Cc:Subject:Date; b=MswLh/8qS9R/QwKFoOfqG+/VHaq60cu/wSLo3B/OdmGUEwO3f3y3bNhGv0gTr/F+M mnI8az7/HByvJNAu9h1W/UM78O4Jcnk3g9qaMCx+AJEJvm7VAsBrNMi+1+9+gGq8Nj pC7vGeuGKU+qmSxk1kVHFKpAYOI6jJg9jpTdoOLn0u3JysIW1zURj7HClQ43RmayF2 JJT0CfP9kudp2iWzPd7cgAhDF+jpbggxwSQIzkdIskK/wQgTIoaXeaCftcMpvcw2ka p+kfF1bebe5cTU61vg2rK2qd6sx0zSLmIXbQGZmgz0mukLiVag0VlwAuJAYLDdt2xi PqFt+645jqm7w8BrnIhgx2A1v/s/ftKC/0+9a5Ur3hs6shzSWIxbM/teIVJ+nMRWGN XGVsXPu6h22dcA1EF47siARdNR4PkOUZ9jJ6mhMYOlov2UssAb/VQWjyNCD4F+132e IZSNM0vnrf3C3WCrGZ/Ms6+vGrtv/E9NGlro+XJae+Pv9kPQkUJdu05NADZXnlIATV DyPvdmm1ps6RKNmXfoq0+0aD3gApRoNsADzYth38bNdHgkBomwWdGYE3Ywel8/OarZ pOtRCy4MyouhydUbXWYZYm3SVQM923rSpwDALO2CXGKBqRvn9KP2cQhmoombH8rm4e zN4gX/ReWmq1ZpheY2VUKEe0= Received: from localhost (unknown [193.32.127.157]) by wolfsden.cz (Postfix) with ESMTPSA id 0273426E97F; Sun, 1 Sep 2024 13:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1725198904; bh=Nz8kKS943NHoVmE9IU+7u/5WuLij5oPE28A/GmrKIZI=; h=From:To:Cc:Subject:Date; b=FSg1pAKr+h00zHwTRz8Wq4eceCtKxnINgby39EczVkUKhC/jYyCdWiQptJdAVeL6E P05fCktgs11xEiBUew/xXq7NqqrF2FySR+Nzv9ijcnAMav1sao6s+MaK7X0OFDzyPC q58lGMIy8EZtK8yphz5BqAYv/oqOmWYco5mrFPuDfI5xmYYwe85GwOIeDiM0/V7u1U 5j3UpjP/DXNxk0tEDorncYau/BbmQ1cSmQebYG1TeYdrwJCRLCpNlP5X5uNvRKG+2m avURV1EyF7Eafi7G6OkFUwQ0Ug7/ZruIOdeFrdj5fgR7yowXYU37CY04KJvcBx7ebN mPBOUawSGhw9F/otF2KF5cb9nDFeeJ2cMsrEtlWSIH/UHGjFtstPfftCd3pZRNchNH CtenGPcCDGjSM1RkJqigEGsjgIy9TNYOexIZt/jTEGNYxeXgq1ZTZwcuVck2KwZs/V tKpPiBSAa958yG6vVcRBjMOOUSBWP6sn27z4i3DBz05wEqc463vcKzQujs4E5EKRfT 9FA2S1SJTuGtTeqW/NSVBSf5QiMn98GvZCviMVG9a9bL104R5xsqgUGu5WTGfNCdBy gWs7pEbbYfjrSp4sRtvTLJqn1CO/4xweLWC17X1h3KRVEhp7NR+YDNL+wLKAayA03T DbVrmCOlLpZj0KZRViq0tMuM= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 1 Sep 2024 15:54:49 +0200 Message-ID: <9f9f76785a5f43b77eeff14d407c675876dffd61.1725198888.git.~@wolfsden.cz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Instead of warning, print the profile path of the cached-channel-instance. * guix/scripts/time-machine.scm (guix-time-machine)[not command-line]: Print the profile directory. Change-Id: Id2c1ded514e6c5af45af9008ad1ef91beb509177 --- guix/scripts/time-machine.scm | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) base-commit: ef525ba96f04c6b3a5e45ab5333c9f440df81e5f diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index d9ce85df84..8cad457ade 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -179,22 +179,22 @@ (define-command (guix-time-machine . args) (ref (assoc-ref opts 'ref)) (substitutes? (assoc-ref opts 'substitutes?)) (authenticate? (assoc-ref opts 'authenticate-channels?))) - (if command-line - (let* ((directory - (with-store store - (with-status-verbosity (assoc-ref opts 'verbosity) - (with-build-handler (build-notifier #:use-substitutes? - substitutes? - #:verbosity - (assoc-ref opts 'verbosity) - #:dry-run? #f) - (set-build-options-from-command-line store opts) - (cached-channel-instance store channels - #:authenticate? authenticate? - #:reference-channels - %reference-channels - #:validate-channels - validate-guix-channel))))) - (executable (string-append directory "/bin/guix"))) - (apply execl (cons* executable executable command-line))) - (warning (G_ "no command specified; nothing to do~%"))))))) + (let* ((directory + (with-store store + (with-status-verbosity (assoc-ref opts 'verbosity) + (with-build-handler (build-notifier #:use-substitutes? + substitutes? + #:verbosity + (assoc-ref opts 'verbosity) + #:dry-run? #f) + (set-build-options-from-command-line store opts) + (cached-channel-instance store channels + #:authenticate? authenticate? + #:reference-channels + %reference-channels + #:validate-channels + validate-guix-channel))))) + (executable (string-append directory "/bin/guix"))) + (if command-line + (apply execl (cons* executable executable command-line)) + (format #t "~a\n" directory)))))))