Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapt makechrootpkg invocation to change in devtools-custom

This commit is contained in:
Martchus 2024-03-16 22:36:00 +01:00
parent 2f4f4ffa5c
commit f7272c0836
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librepomgr/buildactions/conductbuild.cpp
View File

@ -1142,7 +1142,7 @@ void ConductBuild::invokeMakechrootpkgStep3(std::shared_ptr<BuildProcessSession>
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();

2
librepomgr/tests/buildactions.cpp
View File

@ -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,