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

Implement preserving chroot for containerized builds as well 

This keeps the container around by passing the `DEBUG´ environment variable
recognized by `makechrootpkg`.
This commit is contained in:
Martchus 2023-02-03 23:05:46 +01:00
parent e5f4dc156c
commit e477613a8b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
librepomgr/buildactions/conductbuild.cpp
View File

@ -20,6 +20,7 @@
#include <boost/asio/read.hpp>
#include <boost/process/env.hpp>
#include <boost/process/start_dir.hpp>
#include <rapidjson/error/en.h>
@ -939,8 +940,9 @@ InvocationResult ConductBuild::invokeMakepkgToMakeSourcePackage(const BatchProce
m_buildAction->log()(Phrases::InfoMessage, "Making source package for ", packageName, " via ", m_makePkgPath.string(), '\n',
ps(Phrases::SubMessage), "build dir: ", buildDirectory, '\n');
if (m_useContainer) {
processSession->launch(
boost::process::start_dir(buildDirectory), m_makeContainerPkgPath, "--", "-f", "--nodeps", "--nobuild", "--source", additionalFlags);
const auto debugFlag = m_saveChrootDirsOfFailures ? "on-failure" : "";
processSession->launch(boost::process::start_dir(buildDirectory), boost::process::env["DEBUG"] = debugFlag, m_makeContainerPkgPath, "--",
"-f", "--nodeps", "--nobuild", "--source", additionalFlags);
} else {
processSession->launch(boost::process::start_dir(buildDirectory), m_makePkgPath, "-f", "--nodeps", "--nobuild", "--source", additionalFlags);
}