Pass `PKGNAME` to `makecontainerpkg` to avoid sourcing PKGBUILD again
This commit is contained in:
parent
1a4b9282d2
commit
c31027fc7f
|
@ -944,8 +944,8 @@ InvocationResult ConductBuild::invokeMakepkgToMakeSourcePackage(const BatchProce
|
||||||
ps(Phrases::SubMessage), "build dir: ", buildDirectory, '\n');
|
ps(Phrases::SubMessage), "build dir: ", buildDirectory, '\n');
|
||||||
if (m_useContainer) {
|
if (m_useContainer) {
|
||||||
const auto debugFlag = m_saveChrootDirsOfFailures ? "on-failure" : "";
|
const auto debugFlag = m_saveChrootDirsOfFailures ? "on-failure" : "";
|
||||||
processSession->launch(boost::process::start_dir(buildDirectory), boost::process::env["DEBUG"] = debugFlag, m_makeContainerPkgPath, "--",
|
processSession->launch(boost::process::start_dir(buildDirectory), boost::process::env["DEBUG"] = debugFlag,
|
||||||
"-f", "--nodeps", "--nobuild", "--source", additionalFlags);
|
boost::process::env["PKGNAME"] = packageName, 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