Skip to content

Commit 5d2007d

Browse files
committed
Fix ordering of system-type check
We would still like a message indicating that a kernel process starts on Windows. * jupyter-kernel-process-manager.el (jupyter-start-kernel) [jupyter-spec-kernel]: Do it.
1 parent 6be4f79 commit 5d2007d

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

jupyter-kernel-process-manager.el

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,21 +189,22 @@ argument of the process."
189189
else if (equal arg "{resource_dir}")
190190
collect (file-local-name resource-dir)
191191
else collect arg))
192-
;; Windows systems may not have good time resolution when retrieving
193-
;; the last access time of a file so we don't bother with checking that
194-
;; the kernel has read the connection file and leave it to the
195-
;; downstream initialization to ensure that we can communicate with a
196-
;; kernel.
197-
(unless (memq system-type '(ms-dos windows-nt cygwin))
198-
(jupyter--after-kernel-process-ready kernel
199-
"Starting %s kernel process..."
200-
:wait-form (let ((attribs (file-attributes conn-file)))
201-
;; `file-attributes' can potentially return nil, in this case
202-
;; just assume it has read the connection file so that we can
203-
;; know for sure it is not connected if it fails to respond to
204-
;; any messages we send it.
205-
(or (null attribs)
206-
(not (equal atime (nth 4 attribs))))))))))
192+
(jupyter--after-kernel-process-ready kernel
193+
"Starting %s kernel process..."
194+
:wait-form
195+
;; Windows systems may not have good time resolution when retrieving
196+
;; the last access time of a file so we don't bother with checking that
197+
;; the kernel has read the connection file and leave it to the
198+
;; downstream initialization to ensure that we can communicate with a
199+
;; kernel.
200+
(or (memq system-type '(ms-dos windows-nt cygwin))
201+
(let ((attribs (file-attributes conn-file)))
202+
;; `file-attributes' can potentially return nil, in this case
203+
;; just assume it has read the connection file so that we can
204+
;; know for sure it is not connected if it fails to respond to
205+
;; any messages we send it.
206+
(or (null attribs)
207+
(not (equal atime (nth 4 attribs))))))))))
207208

208209
;;; `jupyter-kernel-process-manager'
209210

0 commit comments

Comments
 (0)