aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-12-18 16:30:39 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2016-12-18 16:30:39 -0800
commit3c25a9a794dbbadeaf417adc896f508a22456a7d (patch)
tree925b17dd3ade215f971656fbfec19eccfbf6fc4e
parentrsync-gen: be clear about variable purposes. (diff)
downloadmastermirror-scripts-3c25a9a794dbbadeaf417adc896f508a22456a7d.tar.gz
mastermirror-scripts-3c25a9a794dbbadeaf417adc896f508a22456a7d.tar.bz2
mastermirror-scripts-3c25a9a794dbbadeaf417adc896f508a22456a7d.zip
rsync-gen: declare new vars for changelog module.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rwxr-xr-xrsync-gen.sh3
-rw-r--r--rsync-gen.vars2
2 files changed, 4 insertions, 1 deletions
diff --git a/rsync-gen.sh b/rsync-gen.sh
index 0981600..87eb85d 100755
--- a/rsync-gen.sh
+++ b/rsync-gen.sh
@@ -53,6 +53,7 @@ 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}
@@ -99,7 +100,7 @@ timelog___end "STAGING RSYNC" | timelogger
timelog_start "CHANGELOG-IMPORT" | timelogger
rsync -Wqa \
$RSYNC_GIT_EXCLUDE \
- ${EXPORTS}/changelogs/ ${STAGEDIR_repo_gentoo}
+ ${EXPORTS}/changelogs/ ${STAGEDIR_changelogs}
timelog___end "CHANGELOG-IMPORT" | timelogger
# end 1a)
diff --git a/rsync-gen.vars b/rsync-gen.vars
index 58b5ee0..69d4d2c 100644
--- a/rsync-gen.vars
+++ b/rsync-gen.vars
@@ -6,6 +6,7 @@ BASE="/var/tmp/gmirror-rsync"
[[ $HOSTNAME == kookaburra ]] && BASE="/var/tmp/gmirror"
EXPORTS="${BASE}/exports"
STAGEDIR_repo_gentoo="${BASE}/gentoo-x86-stage" # Legacy path
+STAGEDIR_changelogs="${BASE}/stage/repo-gentoo-changelogs"
CACHEDIR="${BASE}/cache"
LOGDIR="${BASE}/logs"
TIMESLOG="${LOGDIR}/$(basename $0)-times.log"
@@ -16,6 +17,7 @@ export EPYTHON=python3.4
# XXX: If these change, then you MUST change the rsyncd modules
FINALDIR_repo_gentoo="${BASE}/gentoo-x86-final" # Legacy path
+FINALDIR_changelogs="${BASE}/final/repo-gentoo-changelogs"
# snapshots-create.sh
UPLOAD="${BASE}/snapshots-final/"
REPODIR="${BASE}/gentoo-repo-final" # GITDIR is a magic variable for Git