[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: syscalls: 'terminal-columns' swallows ENOSYS.
From: |
Ludovic Courtès |
Subject: |
01/02: syscalls: 'terminal-columns' swallows ENOSYS. |
Date: |
Sun, 1 Jan 2017 22:39:18 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit a6e0ae4046911023044563bafd0aa8b662bb1de9
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 1 23:38:07 2017 +0100
syscalls: 'terminal-columns' swallows ENOSYS.
* guix/build/syscalls.scm (terminal-columns): Catch ENOSYS.
---
guix/build/syscalls.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 9386c0f..2e37846 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;;
@@ -1474,7 +1474,9 @@ always a positive integer."
;; ENOTTY is what we're after but 2012-and-earlier Linux versions
;; would return EINVAL instead in some cases:
;; <https://bugs.ruby-lang.org/issues/10494>.
- (if (or (= errno ENOTTY) (= errno EINVAL))
+ ;; Furthermore, some FUSE file systems like unionfs return ENOSYS for
+ ;; that ioctl.
+ (if (memv errno (list ENOTTY EINVAL ENOSYS))
(fall-back)
(apply throw args))))))