actions/cache-apt-pkgs-action
1
0
Fork 0
mirror of https://github.com/awalsh128/cache-apt-pkgs-action.git synced 2026-06-16 04:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict markers in install_and_cache_pkgs.sh: use PR's ls approach for all dpkg info files

Browse source
This commit is contained in:
copilot-swe-agent[bot] 2026-06-13 23:34:42 +00:00 committed by GitHub
parent 9a8897f258
commit da3be0d789
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
install_and_cache_pkgs.sh
View file

@ -105,16 +105,11 @@ for installed_package in ${installed_packages}; do
# and all dpkg metadata (info files) to Tar.
tar -cf "${cache_filepath}" -C / --verbatim-files-from --files-from <(
{ dpkg -L "${package_name}" &&
<<<<<<< HEAD
{ get_install_script_filepath "/" "${package_name}" "preinst" ;
get_install_script_filepath "/" "${package_name}" "postinst" ; } ; } |
=======
# Include all dpkg info files for this package (list, md5sums,
# conffiles, triggers, preinst, postinst, prerm, postrm, etc.)
# so dpkg recognizes the package after cache restore.
ls -1 /var/lib/dpkg/info/${package_name}.* 2>/dev/null &&
ls -1 /var/lib/dpkg/info/${package_name}:*.* 2>/dev/null ; } |
>>>>>>> origin/pr/190
while IFS= read -r f; do
if test -f "${f}" -o -L "${f}"; then
get_tar_relpath "${f}"