Skip to content

fix: dpkg find copyright #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmsuseluda wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: dpkg find copyright #302

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f3fb8
fix: dpkg find copyright
bmsuseluda Dec 13, 2024
c207969
Merge branch 'master' into fix/dpkgFindCopyright
bmsuseluda Dec 14, 2024
1f7c775
Merge branch 'master' into fix/dpkgFindCopyright
bmsuseluda Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: dpkg find copyright
  • Loading branch information
@bmsuseluda
bmsuseluda committed Dec 13, 2024
commit f7f3fb8f8da1544b90e6c13a18629b6bd404a104
8 changes: 5 additions & 3 deletions src/core/copyright/copyright_dpkgquery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ namespace linuxdeploy {
ldLog() << LD_DEBUG << "Canonical path" << realpath << "not equivalent to" << path << std::endl;
}

subprocess::subprocess proc{{"dpkg-query", "-S", realpath.c_str()}};
const auto filename = fs::path(realpath).filename();

subprocess::subprocess proc{{"dpkg-query", "-S", filename.c_str()}};

auto result = proc.run();

if (result.exit_code() != 0 || result.stdout_contents().empty()) {
ldLog() << LD_WARNING << "Could not find copyright files for file" << path << "using dpkg-query"
ldLog() << LD_WARNING << "Could not find copyright files for file" << realpath << "using dpkg-query"
<< std::endl;
return {};
}
Expand All @@ -35,7 +37,7 @@ namespace linuxdeploy {
return {copyrightFilePath};
}
} else {
ldLog() << LD_WARNING << "Could not find copyright files for file" << path << "using dpkg-query"
ldLog() << LD_WARNING << "Could not find copyright files for file" << realpath << "using dpkg-query"
<< std::endl;
}

Expand Down