[46339] trunk/base/portmgr/jobs/mprsyncup

[wsiegrist at apple.com]

Revision: 46339
          http://trac.macports.org/changeset/46339
Author:   wsiegrist at apple.com
Date:     2009-02-02 16:04:54 -0800 (Mon, 02 Feb 2009)
Log Message:
-----------
Cleanup working copies as needed before attempting to update

Modified Paths:
--------------
    trunk/base/portmgr/jobs/mprsyncup

Modified: trunk/base/portmgr/jobs/mprsyncup
===================================================================
--- trunk/base/portmgr/jobs/mprsyncup	2009-02-02 23:55:02 UTC (rev 46338)
+++ trunk/base/portmgr/jobs/mprsyncup	2009-02-03 00:04:54 UTC (rev 46339)
@@ -35,6 +35,7 @@
 
 # Commands we need:
 SVN="/opt/local/bin/svn -q --non-interactive"
+CLEANUP="/opt/local/bin/svn --non-interactive cleanup"
 RSYNC="/usr/bin/rsync -q"
 RM="/bin/rm"
 MKDIR="/bin/mkdir"
@@ -51,6 +52,10 @@
 SVNURL=http://svn.macports.org/repository/macports
 RELEASE_URL_FILE=config/RELEASE_URL
 
+# cleanup up the working copy if it is locked
+if [ -f ${TBASE}/.svn/lock ]; then
+    ${CLEANUP} ${TBASE}
+fi
 
 # Update/checkout trunk's base, export and rsync it to the rsync repos location (${RSYNCROOT}):
 if [ -d ${TBASE}/.svn ]; then
@@ -94,10 +99,14 @@
 fi
 ${RSYNC} -a -I --delete ${RBASE}-export/ ${RSYNCROOT}/release/base && ${RM} -rf ${RBASE}-export
 
+# clean up the working copy if it is locked
+if [ -f ${PORTS}/.svn/lock ]; then
+      ${CLEANUP} ${PORTS}
+fi
 
 # Update/checkout the ports tree, export it and rsync it to ${RSYNCROOT}/release/ports:
 if [ -d ${PORTS}/.svn ]; then
-  ${SVN} update ${PORTS}  
+    ${SVN} update ${PORTS}  
 else
     ${SVN} checkout ${SVNURL}/trunk/dports ${PORTS}
 fi
@@ -126,3 +135,4 @@
     cd trunk
     ${RM} -rf dports && ${LN} -s ../release/ports dports
 fi
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090202/9db583ea/attachment.html>