From 38996b1ac04e8164c83c085ad5cee748cec38e0c Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Fri, 17 Feb 2017 23:13:22 +0100
Subject: d-i: perhaps fix the triggering of _pdf_po2xml jobs by _html_po2xml

---
 job-cfg/d-i.yaml.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'job-cfg')

diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index ba4ff7b3..0625eba5 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -228,10 +228,13 @@ def publ_email(irc=None):
     return {'email': {'recipients': ' '.join(r)}}
 
 
-def publ(fmt=None, trigger=None, irc=None):
+def publ(fmt=None, trigger=None, irc=None, po=None):
     p = []
     if trigger is not None:
-        p = [{'trigger': {'project': 'd-i_manual_{lang}_pdf',
+        proj = ['d-i_manual_{lang}_pdf']
+        if po:
+          proj.append(po)
+        p = [{'trigger': {'project': '_'.join(proj),
                           'threshold': 'UNSTABLE'}}]
     p.extend([
         {'logparser': {
@@ -291,7 +294,7 @@ def jobspec_svn(key, name, desc, defaults=None,
          'properties': prop(priority=priority),
          'name': name}
     j['publishers'] = (publishers if publishers is not None
-                       else publ(fmt=fmt, trigger=trigger, irc='debian-boot'))
+                       else publ(fmt=fmt, trigger=trigger, irc='debian-boot', po=po))
 
     j['description'] = desc
     j['description'] += ' {do_not_edit}'
@@ -355,7 +358,7 @@ for f in ['html', 'pdf']:
                         lang='{lang}',
                         fmt=f,
                         po=po,
-                        trigger=('{trg}' if not (f == 'pdf' and po == '')
+                        trigger=('{trg}' if f == 'html'
                                  else None),
                         desc=desc_str[f],
                         logkeep=90))
-- 
cgit v1.2.3-54-g00ecf