[Libreoffice-commits] dev-tools.git: 3 commits - gerritbot/crontab.txt gerritbot/patchpickup gerritbot/.procmailrc

[Bjoern Michaelsen]

 gerritbot/.procmailrc |   12 ------------
 gerritbot/crontab.txt |    4 ++--
 gerritbot/patchpickup |    7 ++++++-
 3 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 6fa7a2c344ed6e8a445b71b7d4b16859b6106eb9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jun 7 11:07:31 2013 +0200

    add more branches to patchpickup

diff --git a/gerritbot/patchpickup b/gerritbot/patchpickup
index 8729f23..1b34512 100755
--- a/gerritbot/patchpickup
+++ b/gerritbot/patchpickup
@@ -23,7 +23,12 @@ from  email.mime.text import MIMEText
 
 sourceurl = 'ssh://logerrit/core'
 desturl = 'ssh://logerrit/core'
-legalbranches = [ 'master', 'libreoffice-3-6', 'libreoffice-3-5', 'libreoffice-3-5-6', 'libreoffice-4-0' ]
+majors = [ '3-5', '3-6', '4-0', '4-1', '4-2', '4-3' ] # should be enough until autumn 2014
+
+legalbranches = [ 'master' ]
+for major in majors:
+    for minor in range(8):
+        legalbranches.append('libreoffice-%s-%d' % (major, minor))
 
 logfile=os.path.join(os.environ['HOME'], 'patchpickup.log')
 loglevel='INFO'
commit 445a35ca10077c1188b7b5daf2865d4c4fa03e78
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jun 7 11:02:17 2013 +0200

    sync uncommitted changes from production environment

diff --git a/gerritbot/.procmailrc b/gerritbot/.procmailrc
index ca9e05c..e52ad12 100644
--- a/gerritbot/.procmailrc
+++ b/gerritbot/.procmailrc
@@ -8,17 +8,5 @@ LOGFILE=$HOME/.Maildir/procmail.log
 | /home/gerritbot/dev-tools/gerritbot/mangleandmailtodevlist
 #! libreoffice at lists.freedesktop.org
 
-:0c:
-* ^Subject: \[PATCH\]
-| /home/gerritbot/dev-tools/gerritbot/patchpickup
-
-:0c:
-* ^Subject: \[CHERRYPICK\]
-| /home/gerritbot/dev-tools/gerritbot/patchpickup
-
-:0c:
-* ^Subject: \[HELP\]
-| /home/gerritbot/dev-tools/gerritbot/patchpickup
-
 :0:
 all/
diff --git a/gerritbot/crontab.txt b/gerritbot/crontab.txt
index 2eab4cd..31c4d64 100644
--- a/gerritbot/crontab.txt
+++ b/gerritbot/crontab.txt
@@ -21,5 +21,5 @@
 # 
 # m h  dom mon dow   command
 */5 * * * * getmail -q
-*/15 * * * * /home/gerritbot/dev-tools/gerritbot/syncgerrit
+#*/15 * * * * /home/gerritbot/dev-tools/gerritbot/syncgerrit
 0 6 * * * /home/gerritbot/dev-tools/gerritbot/send-daily-digest -g logerrit
diff --git a/gerritbot/patchpickup b/gerritbot/patchpickup
index f79eb0a..8729f23 100755
--- a/gerritbot/patchpickup
+++ b/gerritbot/patchpickup
@@ -23,7 +23,7 @@ from  email.mime.text import MIMEText
 
 sourceurl = 'ssh://logerrit/core'
 desturl = 'ssh://logerrit/core'
-legalbranches = [ 'master', 'libreoffice-3-6', 'libreoffice-3-5', 'libreoffice-3-5-6' ]
+legalbranches = [ 'master', 'libreoffice-3-6', 'libreoffice-3-5', 'libreoffice-3-5-6', 'libreoffice-4-0' ]
 
 logfile=os.path.join(os.environ['HOME'], 'patchpickup.log')
 loglevel='INFO'
commit c16ef58063cb77a4b4542eed716b5c151cbe6536
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jun 7 10:58:48 2013 +0200

    doh, we should also give the required parameter

diff --git a/gerritbot/crontab.txt b/gerritbot/crontab.txt
index 932747f..2eab4cd 100644
--- a/gerritbot/crontab.txt
+++ b/gerritbot/crontab.txt
@@ -22,4 +22,4 @@
 # m h  dom mon dow   command
 */5 * * * * getmail -q
 */15 * * * * /home/gerritbot/dev-tools/gerritbot/syncgerrit
-0 6 * * * /home/gerritbot/dev-tools/gerritbot/send-daily-digest
+0 6 * * * /home/gerritbot/dev-tools/gerritbot/send-daily-digest -g logerrit