update_ebuilds: Do not generate metadata/md5-cache files

The metadata/md5-cache is not required and we stop using it because
this machine-generated content is a common cause for merge conflicts
and has no benefits.
This commit is contained in:
Kai Lüke 2020-07-28 15:17:08 +02:00
parent 52aaa06c79
commit 254db834fd
No known key found for this signature in database
GPG Key ID: E5601DA3A1D902A8

View File

@ -20,8 +20,6 @@ DEFINE_string rsync "rsync://rsync.gentoo.org/gentoo-portage" \
"Rsync location for gentoo-portage to use with --portage=rsync" "Rsync location for gentoo-portage to use with --portage=rsync"
DEFINE_boolean commit ${FLAGS_FALSE} \ DEFINE_boolean commit ${FLAGS_FALSE} \
"Commit all changes after updating portage-stable." "Commit all changes after updating portage-stable."
DEFINE_boolean regencache ${FLAGS_TRUE} \
"Regenerate cache for updated ebuilds."
# Parse flags # Parse flags
@ -38,11 +36,6 @@ if [[ -z "$*" ]]; then
die "No packages provided" die "No packages provided"
fi fi
# eclass updates impact coreos-overlay too, use update_metadata.
if [[ "$*" == *eclass* ]]; then
FLAGS_regencache=${FLAGS_FALSE}
fi
cd "$FLAGS_portage_stable" cd "$FLAGS_portage_stable"
for pkg in "$@"; do for pkg in "$@"; do
@ -75,11 +68,6 @@ for pkg in "$@"; do
git add -A "$pkg" git add -A "$pkg"
# Sync up the ebuild metadata cache
if [[ $FLAGS_regencache -eq $FLAGS_TRUE && "$pkg" == */* && "$pkg" != metadata/glsa ]]; then
egencache --repo=portage-stable --update "$pkg"
git add -A "metadata/md5-cache/${pkg}-*"
fi
done done
if [[ $FLAGS_commit -eq $FLAGS_TRUE ]]; then if [[ $FLAGS_commit -eq $FLAGS_TRUE ]]; then
@ -98,6 +86,3 @@ else
git status git status
fi fi
if [[ "$*" == *eclass* ]]; then
info "Please run update_metadata to update cache in all overlays."
fi