aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-12-18 16:26:56 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2016-12-18 16:26:56 -0800
commit67a4ae8319594379212d90c8918ca8b31c18abff (patch)
treef7fd84dc725e786a703c3d280118c0ba50848937
parentmake git commit quiet (diff)
downloadmastermirror-scripts-67a4ae8319594379212d90c8918ca8b31c18abff.tar.gz
mastermirror-scripts-67a4ae8319594379212d90c8918ca8b31c18abff.tar.bz2
mastermirror-scripts-67a4ae8319594379212d90c8918ca8b31c18abff.zip
rsync-gen: start to drop old changelog code.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rwxr-xr-xrsync-gen.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/rsync-gen.sh b/rsync-gen.sh
index 50c6dbc..7816c5a 100755
--- a/rsync-gen.sh
+++ b/rsync-gen.sh
@@ -174,13 +174,8 @@ sed -i \
# 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)
-EGENCACHE_CHANGELOG=""
-case $HOURS in
- 03|09|15|21) EGENCACHE_CHANGELOG="--update-changelogs --changelog-reversed --changelog-output ChangeLog" ;;
-esac
# for egencache, set user/group or make sure the user is in the portage group
- #--update-changelogs \
GIT_DIR=${EXPORTS}/gentoo-x86/.git/ \
egencache --update --rsync $PARALLEL_PARAMS \
--tolerant --cache-dir=${BASE}/tmp/ \
@@ -190,7 +185,6 @@ location = ${STAGEDIR}
" \
--update-use-local-desc \
--repo=gentoo \
- $EGENCACHE_CHANGELOG \
>> ${REGEN_LOG_DIR}/${REGEN_LOG_FILE} 2>&1
rval=$?
timelog___end "REGEN" | timelogger
@@ -292,7 +286,7 @@ $atomic_rsync -Wqa --exclude=/metadata/timestamp.chk --delete --checksum \
${STAGEDIR}/ \
${FINALDIR}/
-# idea: "max-delete" - require infra approval if wc -l of bak - finaldir is >
+# idea: "max-delete" - require infra approval if wc -l of bak - FINALDIR is >
# 500?
# The previous method of "detecting" some failure was --max-delete=100, this
# exposed breakage to users though.
@@ -356,6 +350,6 @@ git commit -a -q -F /dev/fd/300 300<<-EOF
EOF
)
timelog___end "GIT RSYNC" | timelogger
-# end 7)
+# end 9)
timelog___end "ENTIRE SCRIPT" | timelogger