From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: ui: Move 'show-manifest-transaction' from (guix profiles). Date: Thu, 09 Oct 2014 10:31:55 +0400 Message-ID: <8761ftiwis.fsf@gmail.com> References: <87eguiiqzt.fsf@gmail.com> <877g0amj55.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xc7GZ-0001SV-Dp for guix-devel@gnu.org; Thu, 09 Oct 2014 02:32:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xc7GV-0007mP-09 for guix-devel@gnu.org; Thu, 09 Oct 2014 02:31:59 -0400 In-Reply-To: <877g0amj55.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 08 Oct 2014 21:55:02 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s (2014-10-08 23:55 +0400) wrote: > Alex Kost skribis: [...] > This is another circularity issue. :-/ > > There=E2=80=99s: > > (guix store) -> (guix nar) -> (guix ui) -> (guix store) ... > > This shouldn=E2=80=99t be a problem, except that occasional uses of #:sel= ect > trigger a bug (see .) Ouch, thanks for the explanation. > I=E2=80=99ve fiddled a bit on top of your patch, but couldn=E2=80=99t fin= d any simple > fix. > > However, back to the initial problem, is this a problem if the error > conditions are defined in (guix profiles), which is then imported by > (guix ui)? This is suboptimal, but this kind of circular reference > shouldn=E2=80=99t cause any troubles. Do you mean to "#:select" condition types in (guix ui)? I tried but it failed for me even on =E2=80=9Cmake=E2=80=9D (the patch I tried and the mak= e output are attached). So it looks like even selecting from (guix profile) won't work in (guix ui) or did I miss something? What about making an auxiliary (guix conditions) module with all existing condition types, and use it where needed? I could try to work on it if it sounds reasonable. WDYT? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-profiles-Add-condition-types-for-profiles-and-genera.patch Content-Transfer-Encoding: quoted-printable >From 6b1c3edea51abb464f4265f36f25c5e314731ac2 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 8 Oct 2014 17:29:01 +0400 Subject: [PATCH] profiles: Add condition types for profiles and generations. * guix/profiles.scm (&profile-error, &profile-not-found-error, &missing-generation-error): New condition types. * guix/ui.scm (call-with-error-handling): Handle new types. * guix/scripts/package.scm (roll-back, guix-package): Raise '&profile-not-found-error' where needed. --- guix/profiles.scm | 29 ++++++++++++++++++++++++++++- guix/scripts/package.scm | 18 ++++++++++-------- guix/ui.scm | 12 ++++++++++++ 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 18733a6..b1fa50e 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -35,7 +35,18 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) - #:export (manifest make-manifest + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:export (&profile-error + profile-error? + profile-error-profile + &profile-not-found-error + profile-not-found-error? + &missing-generation-error + missing-generation-error? + missing-generation-error-generation + + manifest make-manifest manifest? manifest-entries =20 @@ -84,6 +95,22 @@ =20 ;;; +;;; Condition types. +;;; + +(define-condition-type &profile-error &error + profile-error? + (profile profile-error-profile)) + +(define-condition-type &profile-not-found-error &profile-error + profile-not-found-error?) + +(define-condition-type &missing-generation-error &profile-error + missing-generation-error? + (generation missing-generation-error-generation)) + + +;;; ;;; Manifests. ;;; =20 diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index fc9c37b..9f3ed3a 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -38,6 +38,8 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) #:use-module (gnu packages) #:use-module (gnu packages base) @@ -109,8 +111,8 @@ return PROFILE unchanged. The goal is to treat '-p ~/.= guix-profile' as if (previous-number (previous-generation-number profile number)) (previous-generation (generation-file-name profile previous-numbe= r))) (cond ((not (file-exists? profile)) ; invalid profile - (leave (_ "profile '~a' does not exist~%") - profile)) + (raise (condition (&profile-not-found-error + (profile profile))))) ((zero? number) ; empty profile (format (current-error-port) (_ "nothing to do: already at the empty profile~%"))) @@ -723,8 +725,8 @@ more information.~%")) (match-lambda (('delete-generations . pattern) (cond ((not (file-exists? profile)) ; XXX: race condition - (leave (_ "profile '~a' does not exist~%") - profile)) + (raise (condition (&profile-not-found-error + (profile profile))))) ((string-null? pattern) (delete-generations (%store) profile @@ -833,8 +835,8 @@ more information.~%")) (newline))) =20 (cond ((not (file-exists? profile)) ; XXX: race condition - (leave (_ "profile '~a' does not exist~%") - profile)) + (raise (condition (&profile-not-found-error + (profile profile))))) ((string-null? pattern) (for-each list-generation (profile-generations profile))) ((matching-generations pattern profile) @@ -915,8 +917,8 @@ more information.~%")) (_ #f)))) =20 (let ((opts (parse-options))) - (or (process-query opts) - (with-error-handling + (with-error-handling + (or (process-query opts) (parameterize ((%store (open-connection))) (set-build-options-from-command-line (%store) opts) =20 diff --git a/guix/ui.scm b/guix/ui.scm index 04345d4..55a8105 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2012, 2013, 2014 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013 Mark H Weaver ;;; Copyright =C2=A9 2013 Nikita Karetnikov +;;; Copyright =C2=A9 2014 Alex Kost ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,11 @@ #:use-module (guix derivations) #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module ((guix licenses) #:select (license? license-name)) + #:use-module ((guix profiles) + #:select (profile-not-found-error? + profile-error-profile + missing-generation-error? + missing-generation-error-generation)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) @@ -229,6 +235,12 @@ interpreted." (location->string loc) (package-full-name package) (build-system-name system)))) + ((profile-not-found-error? c) + (leave (_ "profile '~a' does not exist~%") + (profile-error-profile c))) + ((missing-generation-error? c) + (leave (_ "generation ~a does not exist~%") + (missing-generation-error-generation c))) ((nix-connection-error? c) (leave (_ "failed to connect to `~a': ~a~%") (nix-connection-error-file c) --=20 2.1.2 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=guix-make-fail make all-recursive make[1]: Entering directory '/media/storage/src/guix' Making all in po/guix make[2]: Entering directory '/media/storage/src/guix/po/guix' make[2]: Leaving directory '/media/storage/src/guix/po/guix' Making all in po/packages make[2]: Entering directory '/media/storage/src/guix/po/packages' make[2]: Leaving directory '/media/storage/src/guix/po/packages' make[2]: Entering directory '/media/storage/src/guix' /usr/bin/mkdir -p `dirname "guix/profiles.go"` ; \ LC_ALL=C \ ./pre-inst-env \ /usr/bin/guild compile -L "." -L "." \ -Wformat -Wunbound-variable -Warity-mismatch \ --target="i686-pc-linux-gnu" \ -o "guix/profiles.go" "guix/profiles.scm" ;;; note: source file ./guix/ui.scm ;;; newer than compiled /media/storage/src/guix/guix/ui.go ;;; note: source file ./guix/ui.scm ;;; newer than compiled /home/alexx/.cache/guile/ccache/2.0-LE-4-2.0/media/storage/src/guix/guix/ui.scm.go Backtrace: In ice-9/boot-9.scm: 2951: 19 [define-module* (guix profiles) #:filename ...] 2926: 18 [resolve-imports (((guix ui)) ((guix utils)) ((guix records)) ...)] 2864: 17 [resolve-interface (guix ui) #:select ...] 2789: 16 [# # ...] 3065: 15 [try-module-autoload (guix ui) #f] 2401: 14 [save-module-excursion #] 3085: 13 [#] In unknown file: ?: 12 [primitive-load-path "guix/ui" ...] In ice-9/eval.scm: 505: 11 [# (define-module # # ...)] In ice-9/psyntax.scm: 1106: 10 [expand-top-sequence ((define-module (guix ui) #:use-module ...)) () ...] 989: 9 [scan ((define-module (guix ui) #:use-module ...)) () ...] 279: 8 [scan ((#(syntax-object let # ...) (#) (# #) ...)) () ...] In ice-9/eval.scm: 411: 7 [eval # ()] In ice-9/boot-9.scm: 2951: 6 [define-module* (guix ui) #:filename ...] 2926: 5 [resolve-imports (((guix utils)) ((guix store)) ((guix config)) ...)] 2877: 4 [resolve-interface (guix profiles) #:select ...] 768: 3 [for-each # #] 2883: 2 [# profile-not-found-error?] In unknown file: ?: 1 [scm-error misc-error #f ...] In ice-9/boot-9.scm: 106: 0 [# misc-error ...] ice-9/boot-9.scm:106:20: In procedure #: ice-9/boot-9.scm:106:20: no binding `profile-not-found-error?' in module (guix profiles) Makefile:3871: recipe for target 'guix/profiles.go' failed make[2]: *** [guix/profiles.go] Error 1 make[2]: Leaving directory '/media/storage/src/guix' Makefile:3064: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/media/storage/src/guix' Makefile:1803: recipe for target 'all' failed make: *** [all] Error 2 --=-=-=--