Merge pull request #1275 from thedylman/fix_new_style_steps_in_web

fix more AssertionError's for new-style steps in web status ui

master/buildbot/status/web/logs.py

@@ -191,7 +191,7 @@ def __init__(self, step_status):
     def getChild(self, path, req):
         for log in self.step_status.getLogs():
             if path == log.getName():
-                if log.hasContents():
+                if log.old_hasContents():
                     return IHTMLLog(interfaces.IStatusLog(log))
                 return NoResource("Empty Log '%s'" % path)
         return HtmlResource.getChild(self, path, req)

master/buildbot/status/web/step.py

@@ -47,7 +47,7 @@ def content(self, req, cxt):
             # it chops up the step name.  If we quote it and '/'s
             # are not safe, it escapes the / that separates the
             # step name from the log number.
-            logs.append({'has_contents': l.hasContents(),
+            logs.append({'has_contents': l.old_hasContents(),
                          'name': l.getName(),
                          'link': req.childLink("logs/%s" % urllib.quote(l.getName()))})
 

master/buildbot/status/web/waterfall.py

@@ -194,7 +194,7 @@ def getBox(self, req):
 
         for num in range(len(logs)):
             name = logs[num].getName()
-            if logs[num].hasContents():
+            if logs[num].old_hasContents():
                 url = urlbase + "/logs/%s" % urllib.quote(name)
             else:
                 url = None