Author: breser
Date: Fri Dec 21 00:39:58 2012
New Revision: 1424776

URL: http://svn.apache.org/viewvc?rev=1424776&view=rev
Log:
Fix template variables not being expanded in irkerbridge templates when the
field is empty for some reason (e.g. null log message).

This change causes them to be expanded to "<null>"

* tools/server-side/svnpubsub/irkerbridge.py
  (fill_in_extra_args): Look for empty fields of the Revision object and
    set them to "<null>" before generating output data.

Modified:
    subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py

Modified: subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py?rev=1424776&r1=1424775&r2=1424776&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py Fri Dec 21 
00:39:58 2012
@@ -145,6 +145,12 @@ class BigDoEverythingClass(object):
     return result
 
   def fill_in_extra_args(self, rev):
+    # Set any empty members to the string "<null>"
+    v = vars(rev)
+    for k in v.keys():
+      if not v[k]:
+        v[k] = '<null>'
+       
     # Add entries to the rev object that are useful for
     # formatting.
     rev.log_firstline = rev.log.split("\n",1)[0]


Reply via email to