audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-12 21:25:04 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix forceDeployLibrary

Browse Source
This commit is contained in:
TheAssassin
2018-07-01 01:06:31 +02:00
parent df61b059d3
commit ec862d0af9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/appdir.cpp
View File

@@ -327,10 +327,10 @@ namespace linuxdeploy {
return patchelfPath;
}
bool deployLibrary(const bf::path& path, int recursionLevel = 0, bool checkExcludelist = true, const bf::path& destination = bf::path()) {
bool deployLibrary(const bf::path& path, int recursionLevel = 0, bool forceDeploy = false, const bf::path& destination = bf::path()) {
auto logPrefix = getLogPrefix(recursionLevel);
if (hasBeenVisitedAlready(path)) {
if (!forceDeploy && hasBeenVisitedAlready(path)) {
ldLog() << LD_DEBUG << logPrefix << LD_NO_SPACE << "File has been visited already:" << path << std::endl;
return true;
}
@@ -356,7 +356,7 @@ namespace linuxdeploy {
return false;
};
if (checkExcludelist && isInExcludelist(path.filename())) {
if (forceDeploy && isInExcludelist(path.filename())) {
ldLog() << logPrefix << LD_NO_SPACE << "Skipping deployment of blacklisted library" << path << std::endl;
// mark file as visited
@@ -578,11 +578,11 @@ namespace linuxdeploy {
}
bool AppDir::deployLibrary(const bf::path& path, const bf::path& destination) {
return d->deployLibrary(path, 0, true, destination);
return d->deployLibrary(path, 0, false, destination);
}
bool AppDir::forceDeployLibrary(const bf::path& path, const bf::path& destination) {
return d->deployLibrary(path, 0, false, destination);
return d->deployLibrary(path, 0, true, destination);
}
bool AppDir::deployExecutable(const bf::path& path, const boost::filesystem::path& destination) {