From 7bb2462d06b039b70e13b68ee2b23c39a881ca26 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Mon, 14 Aug 2023 15:04:02 +0800 Subject: fixes CI (#22471) Revert "fixes bareExcept warnings; catch specific exceptions (#21119)" This reverts commit 9207d77848d6f5db3635ae64f3cd4972cdbe3296. --- lib/pure/asynchttpserver.nim | 2 +- lib/std/private/osdirs.nim | 2 +- lib/std/private/osfiles.nim | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pure/asynchttpserver.nim b/lib/pure/asynchttpserver.nim index 0638d21aa..9b369c4bc 100644 --- a/lib/pure/asynchttpserver.nim +++ b/lib/pure/asynchttpserver.nim @@ -381,7 +381,7 @@ const proc listen*(server: AsyncHttpServer; port: Port; address = ""; domain = AF_INET) = ## Listen to the given port and address. when declared(maxDescriptors): - server.maxFDs = try: maxDescriptors() except OSError: nimMaxDescriptorsFallback + server.maxFDs = try: maxDescriptors() except: nimMaxDescriptorsFallback else: server.maxFDs = nimMaxDescriptorsFallback server.socket = newAsyncSocket(domain) diff --git a/lib/std/private/osdirs.nim b/lib/std/private/osdirs.nim index e204b25e4..a4318367d 100644 --- a/lib/std/private/osdirs.nim +++ b/lib/std/private/osdirs.nim @@ -515,7 +515,7 @@ proc copyDirWithPermissions*(source, dest: string, try: setFilePermissions(dest, getFilePermissions(source), followSymlinks = false) - except OSError: + except: if not ignorePermissionErrors: raise for kind, path in walkDir(source): diff --git a/lib/std/private/osfiles.nim b/lib/std/private/osfiles.nim index 69a5af138..f2e7bf11d 100644 --- a/lib/std/private/osfiles.nim +++ b/lib/std/private/osfiles.nim @@ -311,7 +311,7 @@ proc copyFileWithPermissions*(source, dest: string, try: setFilePermissions(dest, getFilePermissions(source), followSymlinks = (cfSymlinkFollow in options)) - except OSError: + except: if not ignorePermissionErrors: raise @@ -402,6 +402,6 @@ proc moveFile*(source, dest: string) {.rtl, extern: "nos$1", copyFile(source, dest, {cfSymlinkAsIs}) try: removeFile(source) - except OSError: + except: discard tryRemoveFile(dest) raise -- cgit 1.4.1-2-gfad0 tr>