[SCM] build.samba.org - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Nov 22 15:29:07 MST 2010
The branch, master has been updated
via 6ea0d69 Automatically show revision history, don't require selecting author.
via 9124c4c Fix lcov.
from d66fb97 revive FileLoad for the moment - it's used by the web interface.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6ea0d6980d824e9229b684f868745d11a92b22e2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Nov 22 23:28:11 2010 +0100
Automatically show revision history, don't require selecting author.
commit 9124c4c1062f3ffc01e98b3e667928563a4b4acc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Nov 22 23:27:52 2010 +0100
Fix lcov.
-----------------------------------------------------------------------
Summary of changes:
buildfarm/__init__.py | 10 +++++-----
buildfarm/web/__init__.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index bc5f415..b515b12 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -63,11 +63,11 @@ def read_trees_from_conf(path):
def lcov_extract_percentage(f):
"""Extract the coverage percentage from the lcov file."""
- for l in f:
- m = re.search('\<td class="headerItem".*?\>Code\ \;covered\:\<\/td\>.*?\n.*?\<td class="headerValue".*?\>([0-9.]+) \%', l)
- if m:
- return m.group(1)
- return None
+ m = re.search('\<td class="headerItem".*?\>Code\ \;covered\:\<\/td\>.*?\n.*?\<td class="headerValue".*?\>([0-9.]+) \%', f.read())
+ if m:
+ return m.group(1)
+ else:
+ return None
class BuildFarm(object):
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 3069be4..77bc1db 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -828,7 +828,7 @@ class RecentCheckinsPage(HistoryPage):
for entry in branch.log(limit=HISTORY_HORIZON):
m = re_author.match(entry.author)
authors[m.group(2)] = m.group(1)
- if author in ("ALL", "", m.group(2)):
+ if author in (None, "ALL", m.group(2)):
interesting.append(entry)
yield "<h2>Recent checkins for %s (%s branch %s)</h2>\n" % (
--
build.samba.org
More information about the samba-cvs
mailing list