Merge kviktor/buildbot:png-status-building (PR #1082)

buildbot · Mar 1, 2014 · 0c4d01f · 0c4d01f
2 parents 9592059 + e3df261
commit 0c4d01f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/master/buildbot/status/web/pngstatus.py b/master/buildbot/status/web/pngstatus.py
@@ -85,12 +85,13 @@ def content(self, request):
             build = self.status.getBuilder(builder).getBuild(b)
             if build is not None:
                 result = build.getResults()
-                data['filename'] = (
-                    results.Results[result] + '_' + size + '.png')
+                if result is not None:
+                    data['filename'] = (
+                        results.Results[result] + '_' + size + '.png')
 
-                # read the png file from the disc
-                png_file = (os.path.dirname(os.path.abspath(__file__)) +
-                            '/files/' + data['filename'])
+                    # read the png file from the disc
+                    png_file = (os.path.dirname(os.path.abspath(__file__)) +
+                                '/files/' + data['filename'])
 
         # load the png file from the file system
         png = open(png_file, 'rb')