From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 08 09:27:00 2019 Received: (at submit) by debbugs.gnu.org; 8 Apr 2019 13:27:00 +0000 Received: from localhost ([127.0.0.1]:49093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hDUIe-0000tQ-AF for submit@debbugs.gnu.org; Mon, 08 Apr 2019 09:27:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hDUIc-0000tC-6g for submit@debbugs.gnu.org; Mon, 08 Apr 2019 09:26:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:50018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDUIW-0001fe-2W for submit@debbugs.gnu.org; Mon, 08 Apr 2019 09:26:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDUIV-00080c-5F for bug-guix@gnu.org; Mon, 08 Apr 2019 09:26:51 -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.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDUIT-0001ef-Er for bug-guix@gnu.org; Mon, 08 Apr 2019 09:26:51 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:35966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDUIS-0001dJ-Sz for bug-guix@gnu.org; Mon, 08 Apr 2019 09:26:49 -0400 Received: by mail-wm1-x32c.google.com with SMTP id h18so14717092wml.1 for ; Mon, 08 Apr 2019 06:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:reply-to:date:message-id:mime-version; bh=a9B3IZOe3BMERjyhbNmciSDk2047FooinXMs1tS1cvU=; b=McY3knUKuPmL3BsPvn9fF6zm1OAq7Kc43sx4WGzyz/jzD2rb4oi5VXLw/caF6i7+jy lL1di9HHN3OmFxz+iBxClL1j5eSk2i+SYLYfp2KtWcmsH+xdEFvyjf8zjyK/MF7rsaTN I8YBedqgBPcPKoAjN+eeMT3XnnA3J+I69ML9t7tuZffwAzYhrVTCBjpqzmFnVn8X6vTi nenLYYEZXZ4qOCfxk351pHDehYHGgUUPK4/t3SMOIlXu+jKl7/UI3tIAGGuvdJpQffUr +KXJ/9HvH1bUSrJTTWpvcza/iNNxiXhBXKlCR03iekCPX4l1c3GKiyEMKtmHu/QjLayF nnAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:reply-to:date :message-id:mime-version; bh=a9B3IZOe3BMERjyhbNmciSDk2047FooinXMs1tS1cvU=; b=dVSX6cmwkgXF7E+FjT/ewtGuEi3q7g302gHQIDo3gAVCNE9YMC13veX9kr6dDD4QqX UVQHMmuD1b6kytXqH8t17BBeS7cu/NqF3mXZ/fRwjoxZd5f0MZjEqHRaAvtnY3GqLhck Kad3/DJKU7Aaqv7Z8cxmM5wUFSpWH+Cepc1IVAwi+1BojyCfDiMxznJPNLEdk167n+07 gE7suFwhORh8gX2hsFPwq8MjoYJvkvzTuePxYbyvj3e6zPo7MjMR9YJeCrmHOZ594TcX /0jI3djCIoqOngywtYw2VJwhCidrGH2s3l3QkjJdSlYUiueQVqWCjyWPDUjVEUWNbK87 NmEw== X-Gm-Message-State: APjAAAWUDMsW0BQ5Hpo/NqER9JpuMz96N7VI+4pykr002r6HQlllyR0i eMHVeWdxsM+kOMxHFvssH5OdcDgwzv8= X-Google-Smtp-Source: APXvYqwPrdBXUAmYrbyHu/eKdweue4YCR7pMDYqtGQc1bzUmFnzPzwORdFZoL8Zb0W5RSh0gkJSSVg== X-Received: by 2002:a1c:9691:: with SMTP id y139mr17619807wmd.64.1554730005699; Mon, 08 Apr 2019 06:26:45 -0700 (PDT) Received: from watership ([87.236.135.19]) by smtp.gmail.com with ESMTPSA id w14sm25654450wrr.16.2019.04.08.06.26.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2019 06:26:44 -0700 (PDT) User-agent: mu4e 1.0; emacs 26.1 From: Alex Sassmannshausen To: bug-guix@gnu.org Subject: `current-source-directory' fails when file-name #f Date: Mon, 08 Apr 2019 14:26:43 +0100 Message-ID: <87h8b8y6ek.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit 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: , Reply-To: alex.sassmannshausen@gmail.com Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, re: /guix/utils.scm:748: When file-name is #f (e.g. in a geiser repl), the procedure's match fails. `assq' returns ('filename . #f). This is handled in the match bodies cond clause, but excluded as possibility by the encapsulating match clause. Alex From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 08 10:23:18 2019 Received: (at 35192) by debbugs.gnu.org; 8 Apr 2019 14:23:18 +0000 Received: from localhost ([127.0.0.1]:50078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hDVB7-0002ak-PR for submit@debbugs.gnu.org; Mon, 08 Apr 2019 10:23:18 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:37208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hDVB6-0002aS-C1 for 35192@debbugs.gnu.org; Mon, 08 Apr 2019 10:23:16 -0400 Received: by mail-wm1-f50.google.com with SMTP id v14so14931041wmf.2 for <35192@debbugs.gnu.org>; Mon, 08 Apr 2019 07:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:reply-to:date:message-id:mime-version; bh=hFy1EhQ9nbQCvvlxLLGqNKk3RfEPcaO+QUd0Vvnnmso=; b=C17sh9zyiXUlnqzmiPhqLLM3imB1gq0NHggXdhtLR308nOg7O1zw4BHZu/DXq07IS5 WCji/De4Rih+ace58348YawrjLdRDr2xZbQgEjgawfNuQ4KYMT/gfqIix2H+h2rVCsrM mxHgxpi/kNO8YrwgmYHvLsQn9FzARUeev9stvgzEyIpSEuQ2cLPVVlTIVurNiUDrLvLG Mmw/9m1OJBikFBs8HoBbF3L310/U5AHub7gVRYY2rlxOODLE4E51RD5jNeiaIk8nYbqK Z4WRvVhJHr27/wkXS0+JPa7UJzTMzdojpOnHOhPYOe0O9XGxXkaHPE3cGjn8UHpZO12M CsMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:reply-to:date :message-id:mime-version; bh=hFy1EhQ9nbQCvvlxLLGqNKk3RfEPcaO+QUd0Vvnnmso=; b=fFKD7quP6uX4WqUDpiM1m9EyQlSDVIOsFTPJ1/rVLzvjN8akFwMdbMnZH+dz5356cU llhOMDOWcGp3SoBKp9CCDk55FWZqcicgmYJgLdrWgNLeu7YZUzGvjM5SG1d3xQIg+En0 en13er//7TNJpqOQVTar6wgqkP73qagffj2ACyJgDQHMhgwkmRQzMGQcczBEceoRTxtu SAuFuy7nJ6NeJSXPQ/OBCOCaGHOK5GDnYXSiXFAZmwidJAF6B3zqSOO+GlkLNRTzSSLR OjvQdYy5a2424wDjF/XzVvUhROrxYxk2srL+4Q4prI8CHmQXGCvz2wBU+Ii1jdkK9/au nRGQ== X-Gm-Message-State: APjAAAW6RgldM6b8tescMaOYd7ScnAGN89e28u853QseckwZ7mXWEXSe 55mvigwg/1ZFbfb8Av8HCqtMt81PvZ4= X-Google-Smtp-Source: APXvYqwPDPHwtVXH7Wl2qx3XStAI0ymuC9+u2CLroTTYQABIwfHN/gpogXiFrdPOz+GUfNPOGqBD1Q== X-Received: by 2002:a1c:6a0d:: with SMTP id f13mr10818305wmc.76.1554733390340; Mon, 08 Apr 2019 07:23:10 -0700 (PDT) Received: from watership ([87.236.135.19]) by smtp.gmail.com with ESMTPSA id s10sm14578661wmh.0.2019.04.08.07.23.08 for <35192@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2019 07:23:09 -0700 (PDT) User-agent: mu4e 1.0; emacs 26.1 From: Alex Sassmannshausen To: 35192@debbugs.gnu.org Subject: Patch Date: Mon, 08 Apr 2019 15:23:08 +0100 Message-ID: <87ftqsy3sj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35192 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: , Reply-To: alex.sassmannshausen@gmail.com Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Please find attached a patch for handling #f file-name. Alex --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-utils-Handle-f-file-name.patch >From e6f7d9c4dbbf89284455d6a05488ab952d5374a4 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Mon, 8 Apr 2019 15:18:23 +0100 Subject: [PATCH] utils: Handle #f file-name. * guix/utils.scm (current-source-directory): Change dispatch to handle #f file-name. --- guix/utils.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index ed1a418cca..12765650d8 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -758,13 +758,11 @@ be determined." ;; the absolute file name by looking at %LOAD-PATH; doing this at ;; run time rather than expansion time is necessary to allow files ;; to be moved on the file system. - (cond ((not file-name) - #f) ;raising an error would upset Geiser users - ((string-prefix? "/" file-name) - (dirname file-name)) - (else - #`(absolute-dirname #,file-name)))) - (#f + (if (string-prefix? "/" file-name) + (dirname file-name) + #`(absolute-dirname #,file-name))) + ((or ('filename . #f) #f) + ;; raising an error would upset Geiser users #f)))))) ;; A source location. -- 2.21.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 17 23:25:12 2019 Received: (at 35192-done) by debbugs.gnu.org; 18 Nov 2019 04:25:12 +0000 Received: from localhost ([127.0.0.1]:43018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWYb9-0005yA-Qs for submit@debbugs.gnu.org; Sun, 17 Nov 2019 23:25:12 -0500 Received: from mail-qk1-f179.google.com ([209.85.222.179]:40475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWYb6-0005xs-Ve for 35192-done@debbugs.gnu.org; Sun, 17 Nov 2019 23:25:10 -0500 Received: by mail-qk1-f179.google.com with SMTP id z16so13292706qkg.7 for <35192-done@debbugs.gnu.org>; Sun, 17 Nov 2019 20:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8ebKZxzff2GFtgzWwwwXYFMHftpud3xjSawNGzSeOZ4=; b=tOo7sXh9EHYw0kIzDV6j6gVyQHNU4GUpQRNqw9Rjhj/T2c3K78iQoJIm5kPFcv7w3v trqT4I/uLByzElANdGMre6Kfr4aXIq2VnZ+N+Nqh1ME4CANtfYLpLzfyHTfp53CtOOxR k4GYbREWxMuSCDtk2Y5j4gh1gMqXDDOBJgUBnV2Piwsx0akcdmkWcqy5jYhI+PQmWX5i jpRbIs5gcSenbfrkOyTv/Fos7q8b3XteDguseXD/8kxScXOrIx/J8g8Saa9rW+w6eSv3 p5GZl4T83/c0ZN5slVOY3U+OG2hFjkbTfQ4HGEAeSs6WWOjh65hqWdMJ+itz8qYDyGdZ u7Xg== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8ebKZxzff2GFtgzWwwwXYFMHftpud3xjSawNGzSeOZ4=; b=Fpo1j3NGEi9eoID5zMitwy78gYZFyslSyvpNvqgWcq8PYlsr7VzmgC2FV7t/N/VP9U 3l11pHRzONrDMayIFT2GRtQP7qlQtEOZyLbw3oo1Nt9EXQ+dMj0/UhK7IcNXzEIF3qPz 41iJPvSOk2AdT/clQwrEcc7dAEOD3wCUoxH1RvWac4Lpy+nSP0Na7iI6D/Jz3Tm2t2X3 kvHmQTrhiiz+rykQn6YptosM+d8C7PpKFXKzQMOMha1f1AeibRIu02wr0PrDtes47cOZ r11b6yoQPXS9Z6xUPiYO698BdjfyzTRvgwSDF98KQt6kHC4Qbi813SMnTDznj2WPeUtf o8qA== X-Gm-Message-State: APjAAAVbtUutIJy/GHocA8iHpO1bs6su7wCH3Pghy9jmr779a2GK+DmS jbWYXIiEUXkXmZPDkUKcv1en5Knw X-Google-Smtp-Source: APXvYqyUBH73PVz+sJ8UfREdZb9wGsHJo3bT9VENm0ieuzG9tpBXUV+21tTZWckGDc/Ai5QJHr0+/g== X-Received: by 2002:a37:c40a:: with SMTP id d10mr22510941qki.126.1574051102980; Sun, 17 Nov 2019 20:25:02 -0800 (PST) Received: from x200 ([206.55.91.146]) by smtp.gmail.com with ESMTPSA id d2sm7987001qkg.77.2019.11.17.20.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Nov 2019 20:25:01 -0800 (PST) From: Maxim Cournoyer To: Alex Sassmannshausen Subject: Re: bug#35192: `current-source-directory' fails when file-name #f References: <87h8b8y6ek.fsf@gmail.com> Date: Mon, 18 Nov 2019 13:24:59 +0900 In-Reply-To: <87h8b8y6ek.fsf@gmail.com> (Alex Sassmannshausen's message of "Mon, 08 Apr 2019 14:26:43 +0100") Message-ID: <87wobxu7z8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35192-done Cc: 35192-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: -1.0 (-) Hello Alex! Alex Sassmannshausen writes: > Hello, > > re: /guix/utils.scm:748: > > When file-name is #f (e.g. in a geiser repl), the procedure's match > fails. `assq' returns ('filename . #f). This is handled in the match > bodies cond clause, but excluded as possibility by the encapsulating > match clause. > > Alex Thank you for the fix! I had the same problem when experimenting at the REPL, and the comment about Geiser in the code didn't help. I've pushed this change as commit b997d43214445462f23947afbbcadf24c6018217. Closing! Maxim From unknown Sun Jun 15 08:40:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 16 Dec 2019 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator