Merge branch 'bug2530' of git://github.com/clepple/buildbot into buil…

…dbot-0.8.8
buildbot · Aug 10, 2013 · 153d359 · 153d359
2 parents 2799d21 + 3fd9995
commit 153d359
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/master/buildbot/status/web/feeds.py b/master/buildbot/status/web/feeds.py
@@ -66,7 +66,7 @@ def render(self, request):
 def rfc822_time(tstamp):
     res = time.strftime("%%s, %d %%s %Y %H:%M:%S GMT",
                                        tstamp)
-    res = res % (tstamp.tm_wday, tstamp.tm_mon)
+    res = res % (_abbr_day[tstamp.tm_wday], _abbr_mon[tstamp.tm_mon])
     return res
 
 class FeedResource(XmlResource):

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -75,6 +75,8 @@ Features
 
 * GNUAutoconf and other pre-defined factories now work correctly (:bb:bug:`2402`)
 
+* The pubDate in RSS feeds is now rendered correctly (:bb:bug:`2530`)
+
 Deprecations, Removals, and Non-Compatible Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~