<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/1842e8b0525081e833ad22c373483691760d10db">https://github.com/macports/macports-infrastructure/commit/1842e8b0525081e833ad22c373483691760d10db</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1842e8b0525081e833ad22c373483691760d10db
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Nov 14 21:58:57 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> mprsyncup: Update comments
</span>---
jobs/mprsyncup | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/mprsyncup b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;color:#808080;'>index 828164d..fc30491 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +65,13 @@ RELEASE_URL_FILE=config/RELEASE_URL
</span> # XXX set real path
PRIVKEY=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cleanup up the working copy if it is locked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update trunk/base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [ -f ${TBASE}/.svn/lock ]; then
${SVN} cleanup ${TBASE}
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update/checkout trunk's base, export and rsync it to the rsync repos location (${RSYNCROOT}):
</span> if [ -d ${TBASE}/.svn ]; then
${SVN} -q update ${TBASE}
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,13 +81,15 @@ fi
</span> ${MKDIR} -p ${RSYNCROOT}/trunk/base
${RSYNC} -aIC --delete ${TBASE}/ ${RSYNCROOT}/trunk/base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Read what tag we're releasing from, switch to/checkout a copy, export and rsync it to ${RSYNCROOT}/release/base:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update release/base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> read RELEASE_URL < ${TBASE}/${RELEASE_URL_FILE}
if [ ! -n ${RELEASE_URL} ]; then
echo "no RELEASE_URL specified in svn trunk, bailing out!"
exit 1
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cleanup up the working copy if it is locked
</span> if [ -f ${RBASE}/.svn/lock ]; then
${SVN} cleanup ${RBASE}
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,12 +102,13 @@ fi
</span> ${MKDIR} -p ${RSYNCROOT}/release/base
${RSYNC} -aIC --delete ${RBASE}/ ${RSYNCROOT}/release/base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clean up the working copy if it is locked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update release/ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [ -f ${PORTS}/.svn/lock ]; then
${SVN} cleanup ${PORTS}
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update/checkout the ports tree, export it and rsync it to ${RSYNCROOT}/release/ports:
</span> if [ -d ${PORTS}/.svn ]; then
${SVN} -q update ${PORTS}
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,13 +149,20 @@ popd
</span> ${MKDIR} -p ${RSYNCROOT}/release/ports
${RSYNC} -aIC --delete ${PORTS}/ ${RSYNCROOT}/release/ports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# symlink trunk ports to release ports since we only have 1 set of ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update trunk/dports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cd ${RSYNCROOT}
if [ ! -L trunk/dports ]; then
cd trunk
${RM} -rf dports && ${LN} -s ../release/ports dports
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update release/tarballs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # generate and sign tarballs of base and dports
# the signature always needs to match, so we try to make this look atomic to
# clients by switching a symlink target
</pre><pre style='margin:0'>
</pre>