diff -Naur orig/emerge-delta-webrsync modified-r1/emerge-delta-webrsync --- emerge-delta-webrsync.old 2006-09-28 10:29:52.000000000 +0000 +++ emerge-delta-webrsync-3.5.1 2006-09-30 12:09:41.000000000 +0000 @@ -410,7 +410,7 @@ echo "thus, bailing (sorry)" exit 5 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 echo "couldn't grab umd5sum (uncompressed md5sum) for ${final_date}." echo "can't compensate for bzip2 version differences iow." @@ -462,7 +462,7 @@ 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 echo "couldn't verify the generated tarball. bug, most likely." exit 5