[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
46/67: installer: Display an eventual backtrace in a page.
From: |
guix-commits |
Subject: |
46/67: installer: Display an eventual backtrace in a page. |
Date: |
Wed, 16 Jan 2019 19:00:42 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit 7c12cfd150747e314bfa07d550ed80779ee34609
Author: Mathieu Othacehe <address@hidden>
Date: Thu Dec 6 11:11:04 2018 +0900
installer: Display an eventual backtrace in a page.
* gnu/installer.scm (installer-program): Write the backtrace in
"/tmp/last-installer-error" and pass the filename to installer-exit-error.
* gnu/installer/newt.scm (exit-error): Display the file passed above in a
textbox.
---
gnu/installer.scm | 19 +++++++++----------
gnu/installer/newt.scm | 21 ++++++++++++++++++++-
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 586ed29..2f01d39 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -333,16 +333,15 @@ selected keymap."
#:steps steps))
(const #f)
(lambda (key . args)
- ((installer-exit-error current-installer) key args)
-
- ;; Be sure to call newt-finish, to restore the terminal into
- ;; its original state before printing the error report.
- (call-with-output-file "/tmp/error"
- (lambda (port)
- (display-backtrace (make-stack #t) port)
- (print-exception port
- (stack-ref (make-stack #t) 1)
- key args)))
+ (let ((error-file "/tmp/last-installer-error"))
+ (call-with-output-file error-file
+ (lambda (port)
+ (display-backtrace (make-stack #t) port)
+ (print-exception port
+ (stack-ref (make-stack #t) 1)
+ key args)))
+ ((installer-exit-error current-installer)
+ error-file key args))
(primitive-exit 1)))
((installer-exit current-installer)))))))
diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm
index 9d92121..31329b5 100644
--- a/gnu/installer/newt.scm
+++ b/gnu/installer/newt.scm
@@ -18,6 +18,7 @@
(define-module (gnu installer newt)
#:use-module (gnu installer record)
+ #:use-module (gnu installer utils)
#:use-module (gnu installer newt ethernet)
#:use-module (gnu installer newt final)
#:use-module (gnu installer newt hostname)
@@ -25,6 +26,7 @@
#:use-module (gnu installer newt locale)
#:use-module (gnu installer newt menu)
#:use-module (gnu installer newt network)
+ #:use-module (gnu installer newt page)
#:use-module (gnu installer newt partition)
#:use-module (gnu installer newt services)
#:use-module (gnu installer newt timezone)
@@ -32,6 +34,7 @@
#:use-module (gnu installer newt utils)
#:use-module (gnu installer newt welcome)
#:use-module (gnu installer newt wifi)
+ #:use-module (guix config)
#:use-module (guix discovery)
#:use-module (guix i18n)
#:use-module (srfi srfi-26)
@@ -46,7 +49,23 @@
(define (exit)
(newt-finish))
-(define (exit-error key . args)
+(define (exit-error file key args)
+ (newt-set-color COLORSET-ROOT "white" "red")
+ (let ((width (nearest-exact-integer
+ (* (screen-columns) 0.8)))
+ (height (nearest-exact-integer
+ (* (screen-rows) 0.7))))
+ (run-file-textbox-page
+ #:info-text (format #f (G_ "The installer has encountered an unexpected \
+problem. The backtrace is displayed below. Please report it by email to \
+<~a>.") %guix-bug-report-address)
+ #:title (G_ "Unexpected problem")
+ #:file file
+ #:exit-button? #f
+ #:info-textbox-width width
+ #:file-textbox-width width
+ #:file-textbox-height height))
+ (newt-set-color COLORSET-ROOT "white" "blue")
(newt-finish))
(define (final-page result prev-steps)
- 35/67: installer: Fix compute calls., (continued)
- 35/67: installer: Fix compute calls., guix-commits, 2019/01/16
- 36/67: installer: Reorder partitionment step., guix-commits, 2019/01/16
- 24/67: installer: Add services page., guix-commits, 2019/01/16
- 37/67: installer: locale: Make clear that the point is to select a glibc locale., guix-commits, 2019/01/16
- 26/67: installer: Add new pages., guix-commits, 2019/01/16
- 07/67: configure: Disable installer build by default., guix-commits, 2019/01/16
- 30/67: installer: Add user module., guix-commits, 2019/01/16
- 50/67: installer: partition: Fix typo., guix-commits, 2019/01/16
- 49/67: installer: partition: Fix swaping and use syscalls., guix-commits, 2019/01/16
- 53/67: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/16
- 46/67: installer: Display an eventual backtrace in a page.,
guix-commits <=
- 22/67: installer: Add configuration formatter., guix-commits, 2019/01/16
- 57/67: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/16
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16
- 13/67: installer: Fix locale installation., guix-commits, 2019/01/16
- 29/67: installer: Fix comments., guix-commits, 2019/01/16
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16
- 38/67: installer: locale: Set English as the default language., guix-commits, 2019/01/16