From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:44:42 2021 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 22:44:42 +0000 Received: from localhost ([127.0.0.1]:55982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsA-0007sZ-Fw for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:44:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:38166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzns8-0007sS-NN for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:44:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzns8-0007qc-60 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:44:40 -0500 Received: from [2a00:1450:4864:20::530] (port=36669 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzns6-0001LY-Hw for guix-patches@gnu.org; Tue, 21 Dec 2021 17:44:39 -0500 Received: by mail-ed1-x530.google.com with SMTP id z5so1019085edd.3 for ; Tue, 21 Dec 2021 14:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6mkQr2zr5wSGL3wTEru24jlpk8vz868hLXUYVZh6bm0=; b=I+e6tHNTQ7TuLO1m7tHP49pgPhex3QdQ1V9YwGkCiCTnnOds4jSBqpsULWrlMMuok8 KqtgdNtIQEYZ2OESqCTIPSoTyRdSMHeIANrR6DNpMyKYFRmYel6eOZhV2+W+H96ujuPk VvxlumUd2W1ndEqAdNICi2IwCD01/5jUefc8C39SsyQx4K0H7xRcNH55fHmrhF3g8erW FjmRNl6ZUmhIZ4f1E3Qh3HVUrr5MB/at/VWRnPzQwmfqgXPqyXxsN5PGgqFifIMX7gMe MrdBjHJt1HrgTM2NWVWKlAtFsomLNG4hj0kfPndHXqagGgTH0hXNUyaRbCiM+QClu8Xl TsNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=6mkQr2zr5wSGL3wTEru24jlpk8vz868hLXUYVZh6bm0=; b=Np/YJKb6aL/yYF0BNvLqgE+C8rNTN0JiW6qTY99GizPw+4J3nq213lPv4IaaakPI6Y a0PEWBlJ2eKH1KSZfDQTGAqQHJ7E3MUqD4Lk2FT/0qjPan07Jjdx3/qy9utDLPlMtuhr WjzKNnSu7l62RUB4AstY3DayVISvT1PQ8Ug9gAxXfhl9iJwupHHatjXjdL2PSq3XUW2W 9Iyo3cdjAk0QK1J6Bj6Lu6ZH903JXtwmvRJq5sUmVthe5y6MV5unw8l0BX4GEzXU3IIR /NumD1ny0Ew8QrTLNGSLtkFsrU1X9EpckOfTIcnfbpYSk45Cr3Df6quZ6XzEC+f/RuAD bwlA== X-Gm-Message-State: AOAM5336qmC4cXNz7ZhfLQjisczq6AsVUY9Xbv940um3a7phSpyznp1d 2Ub+siINjCkBKLm1Eo5aUJZsG3Iq9YvuqQ== X-Google-Smtp-Source: ABdhPJyt5N33EkjoiQWT4yqa8vRnM6N0Da73iXImuyOu9UWFGwa2EJ8RjDn5Qfs3ChedcEvE9dRp7g== X-Received: by 2002:a17:907:d8f:: with SMTP id go15mr349312ejc.501.1640126676911; Tue, 21 Dec 2021 14:44:36 -0800 (PST) Received: from localhost.localdomain ([2a02:ab88:3700:b180:6072:12a9:8472:9a8f]) by smtp.gmail.com with ESMTPSA id bx6sm42452edb.78.2021.12.21.14.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 14:44:36 -0800 (PST) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH] guix: Prepare the UI for continuable &warning exceptions. Date: Tue, 21 Dec 2021 23:40:27 +0100 Message-Id: <20211221224029.2091-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai 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.9 (-) * guix/store.scm (call-with-store): Use raise-continuable to resignal exceptions. This is needed for a later commit that uses continuable exceptions from within git-authenticate to signal warnings that are meant to be displayed for the user. The reason for this is that this way unit tests can explicitly check with a handler that a warning was indeed signalled. * guix/ui.scm (call-with-error-handling): Handle &warning type exceptions by printing them to the user, and then continuing at the place where they were signalled at. * guix/diagnostics.scm (emit-formatted-warning): New exported function. --- this is used in an upcoming patch, filed under a separate id. guix/diagnostics.scm | 4 ++++ guix/store.scm | 7 +++++-- guix/ui.scm | 11 ++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm index 337a73c1a2..8e13e5e30a 100644 --- a/guix/diagnostics.scm +++ b/guix/diagnostics.scm @@ -48,6 +48,7 @@ (define-module (guix diagnostics) formatted-message? formatted-message-string formatted-message-arguments + emit-formatted-warning &fix-hint fix-hint? @@ -163,6 +164,9 @@ (define-syntax-rule (leave args ...) (report-error args ...) (exit 1))) +(define* (emit-formatted-warning fmt . args) + (emit-diagnostic fmt args #:prefix (G_ "warning: ") #:colors %warning-color)) + (define* (emit-diagnostic fmt args #:key location (colors (color)) (prefix "")) "Report diagnostic message FMT with the given ARGS and the specified diff --git a/guix/store.scm b/guix/store.scm index a93e9596d9..a2b3b2f05a 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -34,6 +34,8 @@ (define-module (guix store) #:use-module (guix profiling) #:autoload (guix build syscalls) (terminal-columns) #:use-module (rnrs bytevectors) + #:use-module ((rnrs conditions) #:select (warning?)) + #:use-module ((rnrs exceptions) #:select (raise-continuable)) #:use-module (ice-9 binary-ports) #:use-module ((ice-9 control) #:select (let/ec)) #:use-module (ice-9 atomic) @@ -661,8 +663,9 @@ (define (thunk) (apply values results))))) (with-exception-handler (lambda (exception) - (close-connection store) - (raise-exception exception)) + (unless (warning? exception) + (close-connection store)) + (raise-continuable exception)) thunk))) (define-syntax-rule (with-store store exp ...) diff --git a/guix/ui.scm b/guix/ui.scm index bd999103ff..f492b838d2 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -69,6 +69,8 @@ (define-module (guix ui) #:use-module (srfi srfi-31) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module ((rnrs conditions) + #:select (warning?)) #:autoload (ice-9 ftw) (scandir) #:use-module (ice-9 match) #:use-module (ice-9 format) @@ -690,7 +692,14 @@ (define (port-filename* port) (and (not (port-closed? port)) (port-filename port))) - (guard* (c ((package-input-error? c) + (guard* (c ((warning? c) + (if (formatted-message? c) + (apply emit-formatted-warning + (formatted-message-string c) + (formatted-message-arguments c)) + (emit-formatted-warning "~a" c)) + '()) + ((package-input-error? c) (let* ((package (package-error-package c)) (input (package-error-invalid-input c)) (location (package-location package)) -- 2.34.0