From 556a749362f9c721342908078f05b0234a69bc12 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 2 Mar 2021 18:30:40 +0100 Subject: [PATCH] Improve lock-related code in conductbuild.cpp --- librepomgr/buildactions/conductbuild.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/librepomgr/buildactions/conductbuild.cpp b/librepomgr/buildactions/conductbuild.cpp index a78b598..5c2a942 100644 --- a/librepomgr/buildactions/conductbuild.cpp +++ b/librepomgr/buildactions/conductbuild.cpp @@ -942,7 +942,8 @@ InvocationResult ConductBuild::invokeMakechrootpkg( buildRoot + "/etc/pacman.conf", std::filesystem::copy_options::overwrite_existing); std::filesystem::copy_file(m_makepkgConfigPath, buildRoot + "/etc/makepkg.conf", std::filesystem::copy_options::overwrite_existing); } catch (const std::filesystem::filesystem_error &e) { - auto writeLock = lockToWrite(lock); + chrootLock.lock().unlock(); + const auto writeLock = lockToWrite(lock); packageProgress.error = "Unable to configure chroot \"" % buildRoot % "\": " + e.what(); return InvocationResult::Error; }