macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible PortIndex rsync update failure.

Browse Source 
When attempting to update the local PortIndex from the precomputed
version for the current OS/arch, there is sometimes a preexisting
version with the correct mtime and size, but not the correct content.
With the default options, rsync fails to update it.  This change
suppresses skipping based on size and time (for the index-related
files, not the tarball).

This bug has no obvious user-visible effect, since the bad PortIndex
fails the signature check and is then regenerated, costing extra
time but not malfunctioning.  It's visible in the debug output.

TESTED:
Now correctly uses the downloaded index in a formerly failing case.
This commit is contained in:
Fred Wright
2026-06-25 14:05:11 -07:00
committed by Joshua Root
parent 705a14db2b
commit 928dc476a4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/macports1.0/macports.tcl
+4 -1
View File
@@ -3968,7 +3968,10 @@ proc mportsync {{options {}}} {
set index_source $source
}
set remote_indexdir "${index_source}PortIndex_${os_platform}_${os_major}_${os_arch}/"
set rsync_commandline "$rsync_path $rsync_options $include_option $remote_indexdir $destdir"
# Under some circumstances, there may be a preexisting PortIndex with the correct length
# and mtime, but incorrect content. So we add the -I option to suppress skipping
# based on length and time. Comparison based on content alone isn't very expensive here.
set rsync_commandline "$rsync_path $rsync_options -I $include_option $remote_indexdir $destdir"
macports_try -pass_signal {
macports::run_unprivileged {system -W $destdir $rsync_commandline}