Drop changelogs from rsync data

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

2 files changed, 2 insertions, 32 deletions

diff --git a/mastermirror-staging.sh b/mastermirror-staging.sh
index 0c36cbe..74b3194 100755
--- a/mastermirror-staging.sh
+++ b/mastermirror-staging.sh
@@ -41,7 +41,6 @@ done
 [[ $rc -ne 0 ]] && exit 1
 
 STAGING_DIR="${1:-/var/tmp/mastermirror-staging}"
-STAGING_DIR_changelogs="${STAGING_DIR}/changelogs"
 STAGING_DIR_glsa="${STAGING_DIR}/glsa"
 STAGING_DIR_dtd="${STAGING_DIR}/dtd"
 STAGING_DIR_xmlschema="${STAGING_DIR}/xml-schema"
@@ -53,7 +52,6 @@ REPO_news=${GITROOT}/data/gentoo-news.git
 REPO_dtd=${GITROOT}/data/dtd.git
 REPO_xmlschema=${GITROOT}/data/xml-schema.git
 REPO_glsa=${GITROOT}/data/glsa.git
-REPO_changelogs=${GITROOT}/data/gentoo-changelogs.git
 
 PROJECTS_XML_URI=https://api.gentoo.org/metastructure/projects.xml
 
@@ -144,9 +142,4 @@ fetch_git ${STAGING_DIR_glsa} ${REPO_glsa}
 rc=$?
 rc_sum=$((rc_sum + $rc))
 
-# changelogs
-fetch_git ${STAGING_DIR_changelogs} ${REPO_changelogs}
-rc=$?
-rc_sum=$((rc_sum + $rc))
-
 exit $rc_sum
diff --git a/rsync-gen.sh b/rsync-gen.sh
index eae48c1..e3bdeb4 100755
--- a/rsync-gen.sh
+++ b/rsync-gen.sh
@@ -54,7 +54,6 @@ RSYNC_GIT_EXCLUDE="--include core/ --include '*.old' --cvs-exclude --exclude=.gi
 # sanity checking
 [[ -d ${EXPORTS}  ]]		|| mkdir ${EXPORTS}
 [[ -d ${STAGEDIR_repo_gentoo} ]]		|| mkdir ${STAGEDIR_repo_gentoo}
-[[ -d ${STAGEDIR_changelogs} ]]		|| mkdir ${STAGEDIR_changelogs}
 [[ -d ${FINALDIR_repo_gentoo} ]]		|| mkdir ${FINALDIR_repo_gentoo}
 [[ -d ${REPODIR}  ]]		|| mkdir ${REPODIR}
 [[ -d ${LOGDIR}   ]]		|| mkdir ${LOGDIR}
@@ -94,18 +93,6 @@ if [[ $rc -ne 0 ]]; then
 fi
 # end 1)
 
-# start 1a)
-# Temporary: import old CVS changelogs
-# This will cause some churn, because it'll copy changelogs for packages which
-# don't exist anymore, and then the next rsync will delete them.  You can reduce
-# churn by occasionally culling dead packages from the repo
-timelog_start "CHANGELOG-IMPORT" | timelogger
-rsync -Wqa \
-	$RSYNC_GIT_EXCLUDE \
-	${EXPORTS}/changelogs/ ${STAGEDIR_changelogs}
-timelog___end "CHANGELOG-IMPORT" | timelogger
-# end 1a)
-
 # 1b) rsync EXPORTS/gentoo-x86 to STAGEDIR_repo_gentoo
 
 # timestamp.chk is generated every 5 mins in datestamp.sh script in the FINALDIR_repo_gentoo
@@ -119,7 +106,6 @@ rsync -Wqau \
 	$RSYNC_GIT_EXCLUDE \
 	--filter 'P /metadata/***' \
 	--filter 'Pp Manifest' \
-	--filter 'Pp ChangeLog*' \
 	--delete --delete-excluded \
 	${EXPORTS}/gentoo-x86/ ${STAGEDIR_repo_gentoo}/ || exit
 timelog___end "STAGEDIR_repo_gentoo RSYNC" | timelogger
@@ -174,10 +160,6 @@ sed -i \
 	-e '/^sign-commits/s,false,true,g' \
 	${STAGEDIR_repo_gentoo}/metadata/layout.conf
 
-# Only update the changelogs every 6 hours
-# because right now it takes a very long time to do it (exceeding 1 hour at times).
-HOURS=$(date +%H)
-
 # for egencache, set user/group or make sure the user is in the portage group
 GIT_DIR=${EXPORTS}/gentoo-x86.git/ \
 egencache --update --rsync $PARALLEL_PARAMS \
@@ -278,7 +260,7 @@ timelog___end "HERDS-AND-PROJ" | timelogger
 # timestamp.chk is generated every 5 mins in datestamp.sh script in the FINALDIR_repo_gentoo
 # timestamp.x is generated every 5 mins in datestamp.sh script in the STAGEDIR_repo_gentoo
 # We want to track the progress of STAGEDIR_repo_gentoo->FINALDIR_repo_gentoo so exclude .chk file here
-# Checksum is needed because we explicitly set the timestamp of Manifests/ChangeLogs.
+# Checksum is needed because we explicitly set the timestamp of Manifests.
 # exclude of .git/CVS is just in case we still accidently created them.
 timelog_start "FINAL RSYNC" | timelogger
 FINALDIR_repo_gentoo_tmp=${FINALDIR_repo_gentoo%/}
@@ -320,15 +302,11 @@ timelog___end "FINAL RSYNC" | timelogger
 
 # 8) cache generated data:
 # md5-cache
-# ChangeLog
 timelog_start "CACHE RSYNC" | timelogger
 CACHEDIR_md5cache=${CACHEDIR}/metadata_md5-cache
-CACHEDIR_changelogs=${CACHEDIR}/changelogs
-mkdir -p $CACHEDIR_md5cache $CACHEDIR_changelogs
+mkdir -p $CACHEDIR_md5cache
 # MD5 cache
 rsync -Wqatm --delete ${STAGEDIR_repo_gentoo}/metadata/md5-cache/ $CACHEDIR_md5cache/
-# ChangeLogs: we do NOT use --delete, as we want to keep old ChangeLogs
-rsync -Wqatm --include 'ChangeLog' --include='*/' --exclude='*' ${STAGEDIR_repo_gentoo}/ $CACHEDIR_changelogs/
 timelog___end "CACHE RSYNC" | timelogger
 
 # 9) rsync from STAGEDIR_repo_gentoo to REPODIR ### testing
@@ -336,7 +314,6 @@ timelog_start "GIT RSYNC" | timelogger
 rsync -Wqa --exclude=/metadata/timestamp.chk --delete --checksum \
 	--exclude=.git --exclude=CVS --exclude=.gitignore \
 	--chmod=u-s,g-s \
-	--exclude ChangeLog* \
 	${STAGEDIR_repo_gentoo}/ \
 	${REPODIR}/ && \
 ( cd $REPODIR && \