[SCM] build.samba.org - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  5500e51 remove useless declaration
       via  98e211d get_lcov_cached_status has been removed build the cachefile name for lcov in the cachedbuildfarm class directly
      from  f3d059a change the name of the cache folder

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5500e513ebf163fed00a44509b20113edef41751
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Nov 11 22:44:07 2010 +0300

    remove useless declaration

commit 98e211d96871f92cfcdff20e0daf3876737c6fde
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Nov 11 22:42:47 2010 +0300

    get_lcov_cached_status has been removed build the cachefile name for lcov in the cachedbuildfarm class directly

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/__init__.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 147d0ff..823d51e 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -66,7 +66,6 @@ class BuildFarm(object):
         if path is None:
             path = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
         self.path = path
-        self.cachedir = os.path.join(self.path, "cache")
         self.webdir = os.path.join(self.path, "web")
         if not os.path.isdir(path):
             raise Exception("web directory %s does not exist" % self.webdir)
@@ -164,7 +163,8 @@ class CachingBuildFarm(BuildFarm):
     def lcov_status(self, tree):
         """get status of build"""
         from buildfarm import data, util
-        cachefile = self.builds.get_lcov_cached_status(self.LCOVHOST, tree)
+        cachefile = os.path.join(self.cachedir,
+                                    "lcov.%s.%s.status" % (self.LCOVHOST, tree))
         file = os.path.join(self.lcovdir, self.LCOVHOST, tree, "index.html")
         try:
             st1 = os.stat(file)


-- 
build.samba.org