summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-11-12 10:47:25 +0100
committerLudovic Courtès <ludo@gnu.org>2020-11-12 10:47:25 +0100
commit07914def98ca0d148e3522466227304e45286786 (patch)
tree71f265728ced786cb70de2a5654c9beb45eb77c5 /guix
parenta13063d6ac7434beed1c608ce3eb6fb39c740b33 (diff)
parentef1107e2cca9a5b6f7129d019aabac2f0e89a238 (diff)
Merge branch 'version-1.2.0'
Diffstat (limited to 'guix')
-rw-r--r--guix/lint.scm14
-rw-r--r--guix/scripts/publish.scm2
-rw-r--r--guix/ui.scm3
3 files changed, 8 insertions, 11 deletions
diff --git a/guix/lint.scm b/guix/lint.scm
index e1a77e8ac7..91dbc806dc 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -663,17 +663,11 @@ from ~a")
(define (check-patch-file-names package)
"Emit a warning if the patches requires by PACKAGE are badly named or if the
patch could not be found."
- (guard (c ((message-condition? c) ;raised by 'search-patch'
- (list
- ;; Use %make-warning, as condition-mesasge is already
- ;; translated.
- (%make-warning package (condition-message c)
- #:field 'patch-file-names)))
- ((formatted-message? c)
+ (guard (c ((formatted-message? c) ;raised by 'search-patch'
(list (%make-warning package
- (apply format #f
- (G_ (formatted-message-string c))
- (formatted-message-arguments c))))))
+ (formatted-message-string c)
+ (formatted-message-arguments c)
+ #:field 'source))))
(define patches
(match (package-source package)
((? origin? origin) (origin-patches origin))
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index e3c8711f5b..a976a9ac60 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -891,6 +891,8 @@ blocking."
client))
(port (begin
(force-output client)
+ (setsockopt client SOL_SOCKET
+ SO_SNDBUF (* 128 1024))
(nar-response-port response compression))))
;; XXX: Given our ugly workaround for <http://bugs.gnu.org/21093> in
;; 'render-nar', BODY here is just the file name of the store item.
diff --git a/guix/ui.scm b/guix/ui.scm
index 8d7bc238bc..4e686297e8 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -435,6 +435,7 @@ exiting. ARGS is the list of arguments received by the 'throw' handler."
(gettext (condition-message obj) %gettext-domain)))
((formatted-message? obj)
(warning (G_ "failed to load '~a': ~a~%")
+ file
(apply format #f
(gettext (formatted-message-string obj)
%gettext-domain)
@@ -717,7 +718,7 @@ evaluating the tests and bodies of CLAUSES."
(package-full-name package)
(build-system-name system))))
((gexp-input-error? c)
- (let ((input (package-error-invalid-input c)))
+ (let ((input (gexp-error-invalid-input c)))
(leave (G_ "~s: invalid G-expression input~%")
(gexp-error-invalid-input c))))
((profile-not-found-error? c)