From f7272c08360d0df4a20b0ba48185a0e9a9b4d269 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 16 Mar 2024 22:36:00 +0100 Subject: [PATCH] Adapt makechrootpkg invocation to change in devtools-custom --- librepomgr/buildactions/conductbuild.cpp | 2 +- librepomgr/tests/buildactions.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/librepomgr/buildactions/conductbuild.cpp b/librepomgr/buildactions/conductbuild.cpp index 3081677..12f9608 100644 --- a/librepomgr/buildactions/conductbuild.cpp +++ b/librepomgr/buildactions/conductbuild.cpp @@ -1142,7 +1142,7 @@ void ConductBuild::invokeMakechrootpkgStep3(std::shared_ptr locks.emplace_back(std::move(chrootLock)); auto lock = lockToRead(); auto &packageProgress = m_buildProgress.progressByPackage[packageName]; - processSession->launch(boost::process::start_dir(packageProgress.buildDirectory), m_makeChrootPkgPath, sudoArgs, makechrootpkgFlags, "-C", + processSession->launch(boost::process::start_dir(packageProgress.buildDirectory), m_makeChrootPkgPath, sudoArgs, makechrootpkgFlags, "-Y", m_globalPackageCacheDir, "-r", chrootDir, "-l", packageProgress.chrootUser, packageProgress.makechrootpkgFlags, "--", makepkgFlags, packageProgress.makepkgFlags, boost::process::std_in < boost::asio::buffer(m_sudoPassword)); lock.unlock(); diff --git a/librepomgr/tests/buildactions.cpp b/librepomgr/tests/buildactions.cpp index 893c60c..7f8c07e 100644 --- a/librepomgr/tests/buildactions.cpp +++ b/librepomgr/tests/buildactions.cpp @@ -585,7 +585,7 @@ void BuildActionsTests::testConductingBuild() CPPUNIT_ASSERT_EQUAL_MESSAGE( "no staging needed: updpkgsums log", "fake updatepkgsums: \n"s, readFile("building/build-data/conduct-build-test/boost/pkg/updpkgsums.log")); TESTUTILS_ASSERT_LIKE("no staging needed: build log", - "fake makechrootpkg: -c -u -C .*building/test-cache-dir/x86_64 -r .*chroot-dir/arch-x86_64 -l buildservice --\n"s, + "fake makechrootpkg: -c -u -Y .*building/test-cache-dir/x86_64 -r .*chroot-dir/arch-x86_64 -l buildservice --\n"s, readFile("building/build-data/conduct-build-test/boost/pkg/build.log")); TESTUTILS_ASSERT_LIKE("no staging needed: repo-add log", "fake repo-add: boost.db.tar.zst boost(-libs)?-1\\.73\\.0-1-x86_64.pkg.tar.zst boost(-libs)?-1\\.73\\.0-1-x86_64.pkg.tar.zst\n"s,