[Armagetronad-commits] SF.net SVN: armagetronad: [7846] tools/bzr/trunk

[<baz...@us...>]

Revision: 7846
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7846&view=rev
Author:   bazaarmagetron
Date:     2008-02-10 09:31:03 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
author: bazaarmagetron <z-...@us...>
Fixed the optimization.

Modified Paths:
--------------
    tools/bzr/trunk/synctools/all.sh
    tools/bzr/trunk/synctools/request-sync.sh

Property Changed:
----------------
    tools/bzr/trunk/


Property changes on: tools/bzr/trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-02-10 18:23:08.464999914 +0100
committer: bazaarmagetron <z-...@us...>
properties: 
	branch-nick: bzr

   + timestamp: 2008-02-10 18:25:52.417999983 +0100
committer: bazaarmagetron <z-...@us...>
properties: 
	branch-nick: bzr

Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
   - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz
12 z-...@us...-20080207162744-4riit8379zi13ekd
13 z-...@us...-20080207220145-74cas2qumuyn2vcn
14 z-...@us...-20080207221008-zhs110iw1vtreysm
15 z-...@us...-20080207221223-4b0wgl86lxox3uwj
16 z-...@us...-20080208001947-ff25qitcr900qsvy
17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn
18 z-...@us...-20080208021135-93i43tke8qfcb3u4
19 z-...@us...-20080208120320-6dxkcn46tdv109jb
20 z-...@us...-20080208120416-c3711pdfebb9m8ba
21 z-...@us...-20080208120611-jzqvstdirza22aa0
22 z-...@us...-20080210142402-67q9uws5tgw4anze
23 z-...@us...-20080210153017-32tq0mbladuewpl7
24 z-...@us...-20080210170542-l20whi1m3g5t0xz6
25 z-...@us...-20080210172308-damc370nmc001sy8

   + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz
12 z-...@us...-20080207162744-4riit8379zi13ekd
13 z-...@us...-20080207220145-74cas2qumuyn2vcn
14 z-...@us...-20080207221008-zhs110iw1vtreysm
15 z-...@us...-20080207221223-4b0wgl86lxox3uwj
16 z-...@us...-20080208001947-ff25qitcr900qsvy
17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn
18 z-...@us...-20080208021135-93i43tke8qfcb3u4
19 z-...@us...-20080208120320-6dxkcn46tdv109jb
20 z-...@us...-20080208120416-c3711pdfebb9m8ba
21 z-...@us...-20080208120611-jzqvstdirza22aa0
22 z-...@us...-20080210142402-67q9uws5tgw4anze
23 z-...@us...-20080210153017-32tq0mbladuewpl7
24 z-...@us...-20080210170542-l20whi1m3g5t0xz6
25 z-...@us...-20080210172308-damc370nmc001sy8
26 z-...@us...-20080210172552-t1wni9izsovestm1


Modified: tools/bzr/trunk/synctools/all.sh
===================================================================
--- tools/bzr/trunk/synctools/all.sh	2008-02-10 17:30:47 UTC (rev 7845)
+++ tools/bzr/trunk/synctools/all.sh	2008-02-10 17:31:03 UTC (rev 7846)
@@ -11,6 +11,8 @@
   exit 0
 fi
 
+# set -x
+
 touch .lock
 
 function som()
@@ -20,7 +22,7 @@
     pushd . 2>&1 > /dev/null
     . geturis.sh
     skip=false
-    if test -r modified_bzr_branches_work && ! grep "^${bzrbranch}$" modified_bzr_branches_work > /dev/null; then
+    if test -r modified_bzr_branches_work && ! grep "^${bzrbranch}-work$" modified_bzr_branches_work > /dev/null; then
       skip=true
     fi
     if test -r modified_svn_paths_work && ! grep "^${svnbranch}" modified_svn_paths_work > /dev/null; then
@@ -31,7 +33,9 @@
     fi
     popd  2>&1 > /dev/null
   done
-  
+
+  # failed=true
+
   if $failed = true; then
     echo One of the sync processes failed.
     rm -f .lock
@@ -40,6 +44,32 @@
   fi
 }
 
+# scan mail dir
+maildir=$HOME/.maildir
+for f in ${maildir}/new/*; do
+  if test -r $f; then
+    if grep X-Launchpad-Branch: $f > /dev/null; then
+      branch=$( grep X-Launchpad-Branch: $f | sed -e "s,.*/,," )
+      # echo "Launchpad mail $f, branch: $branch"
+      echo $branch >> modified_bzr_branches
+      mkdir -p ${maildir}/lp
+      mv $f ${maildir}/lp/
+    else
+      if grep "^From:.*@users.sourceforge.net" $f > /dev/null; then
+     
+       # echo "SF mail $f, affected paths:"
+       grep "^    " $f | grep -v "http://" | sed -e "s,^ *,," >> modified_svn_paths
+      mkdir -p ${maildir}/sf
+      mv $f ${maildir}/sf/
+      else
+        echo "Unknown mail $f"
+        mkdir -p ${maildir}/uk
+        mv $f ${maildir}/uk/
+      fi
+    fi
+  fi
+done
+
 for f in modified_bzr_branches modified_svn_paths; do
   test -r $f && mv -f $f ${f}_work
 done

Modified: tools/bzr/trunk/synctools/request-sync.sh
===================================================================
--- tools/bzr/trunk/synctools/request-sync.sh	2008-02-10 17:30:47 UTC (rev 7845)
+++ tools/bzr/trunk/synctools/request-sync.sh	2008-02-10 17:31:03 UTC (rev 7846)
@@ -11,29 +11,6 @@
 
 echo "TRIGGERING SYNC"
 
-# scan mail dir
-maildir=$HOME/.maildir
-for f in ${maildir}/new/*; do
-  if grep X-Launchpad-Branch: $f > /dev/null; then
-    branch=$( grep X-Launchpad-Branch: $f | sed -e "s,.*/,," )
-    # echo "Launchpad mail $f, branch: $branch"
-    echo $branch >> modified_bzr_branches
-    mkdir -p ${maildir}/lp
-    mv $f ${maildir}/lp/
-  else
-    if grep "^From:.*@users.sourceforge.net" $f > /dev/null; then
-     
-     # echo "SF mail $f, affected paths:"
-     grep "^    " $f | grep -v "http://" | sed -e "s,^ *,," >> modified_svn_paths
-    mkdir -p ${maildir}/sf
-    mv $f ${maildir}/sf/
-    else
-      echo "Unknown mail $f"
-      mkdir -p ${maildir}/uk
-      mv $f ${maildir}/uk/
-    fi
-  fi
-done
 rm -f .pleasewait
 killall -KILL bzr-wait-for-commit.sh
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.