View | Details | Raw Unified
Collapse All | Expand All

(-) orig/emerge-delta-webrsync (-3 / +3 lines)
 Lines 218-224    Link Here  
		rm -rf portage
		rm -rf portage
	fi
	fi
	echo "transferring metadata/cache"
	echo "transferring metadata/cache"
	emerge metadata
 
	emerge --metadata
 
}
}

        
fetch_from_mirrors() {
fetch_from_mirrors() {

  

    

    

       Lines 410-416
       
    
  Link Here 
    

  

        
	echo "thus, bailing (sorry)"
	echo "thus, bailing (sorry)"

        
	exit 5
	exit 5

        
else
else

            

              
	if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then

              
	if [[ ! -e portage-${final_date}.tar.bz2.umd5sum ]] && ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then

            

        
		if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then
		if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then

        
			echo "couldn't grab umd5sum (uncompressed md5sum) for ${final_date}."
			echo "couldn't grab umd5sum (uncompressed md5sum) for ${final_date}."

        
			echo "can't compensate for bzip2 version differences iow."
			echo "can't compensate for bzip2 version differences iow."

  

    

    

       Lines 462-468
       
    
  Link Here 
    

  

        

        
echo "verifying generated tarball"
echo "verifying generated tarball"

        

            

              
if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2"; then

              
if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2" "${DISTDIR}/portage-${final_date}.tar.bz2.md5sum"; then

            

        
	if [[ -z $verified ]]; then
	if [[ -z $verified ]]; then

        
		echo "couldn't verify the generated tarball.  bug, most likely."
		echo "couldn't verify the generated tarball.  bug, most likely."

        
		exit 5
		exit 5