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:
parent
e5f4dc156c
commit
e477613a8b
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
#include <boost/asio/read.hpp>
|
#include <boost/asio/read.hpp>
|
||||||
|
|
||||||
|
#include <boost/process/env.hpp>
|
||||||
#include <boost/process/start_dir.hpp>
|
#include <boost/process/start_dir.hpp>
|
||||||
|
|
||||||
#include <rapidjson/error/en.h>
|
#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',
|
m_buildAction->log()(Phrases::InfoMessage, "Making source package for ", packageName, " via ", m_makePkgPath.string(), '\n',
|
||||||
ps(Phrases::SubMessage), "build dir: ", buildDirectory, '\n');
|
ps(Phrases::SubMessage), "build dir: ", buildDirectory, '\n');
|
||||||
if (m_useContainer) {
|
if (m_useContainer) {
|
||||||
processSession->launch(
|
const auto debugFlag = m_saveChrootDirsOfFailures ? "on-failure" : "";
|
||||||
boost::process::start_dir(buildDirectory), m_makeContainerPkgPath, "--", "-f", "--nodeps", "--nobuild", "--source", additionalFlags);
|
processSession->launch(boost::process::start_dir(buildDirectory), boost::process::env["DEBUG"] = debugFlag, m_makeContainerPkgPath, "--",
|
||||||
|
"-f", "--nodeps", "--nobuild", "--source", additionalFlags);
|
||||||
} else {
|
} else {
|
||||||
processSession->launch(boost::process::start_dir(buildDirectory), m_makePkgPath, "-f", "--nodeps", "--nobuild", "--source", additionalFlags);
|
processSession->launch(boost::process::start_dir(buildDirectory), m_makePkgPath, "-f", "--nodeps", "--nobuild", "--source", additionalFlags);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue