From f89b0f7846f2177b65eebdbff7f24a255d66819e Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 4 Apr 2022 08:33:59 -0700
Subject: [PATCH] libutil: `try` restoring the cwd from fdSavedCwd

---
 src/libutil/util.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index a00a03978..1f800f3f4 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1717,12 +1717,12 @@ void restoreMountNamespace()
     try {
         if (fdSavedMountNamespace && setns(fdSavedMountNamespace.get(), CLONE_NEWNS) == -1)
             throw SysError("restoring parent mount namespace");
+        if (fdSavedCwd && fchdir(fdSavedCwd.get()) == -1) {
+            throw SysError("restoring cwd");
+        }
     } catch (Error & e) {
         debug(e.msg());
     }
-    if (fdSavedCwd && fchdir(fdSavedCwd.get()) == -1) {
-        throw SysError("restoring cwd");
-    }
 #endif
 }