diff options
author | Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-07-08 11:54:07 +0200 |
---|---|---|
committer | Stanislav Ochotnicky <sochotnicky@gmail.com> | 2009-07-08 11:58:49 +0200 |
commit | fde477494ee3231227a2f65daa6458898f57ad7d (patch) | |
tree | c8229bf0806dc72914d41b0608e77ec98f73c2e5 /src/tinderbox/__init__.py | |
parent | Changed matchbox according to new protocol (diff) | |
download | collagen-fde477494ee3231227a2f65daa6458898f57ad7d.tar.gz collagen-fde477494ee3231227a2f65daa6458898f57ad7d.tar.bz2 collagen-fde477494ee3231227a2f65daa6458898f57ad7d.zip |
Added dependencies to protocol
also changed build_log and build_env to attachments
Diffstat (limited to 'src/tinderbox/__init__.py')
-rw-r--r-- | src/tinderbox/__init__.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tinderbox/__init__.py b/src/tinderbox/__init__.py index 75c789f..87ef1f7 100644 --- a/src/tinderbox/__init__.py +++ b/src/tinderbox/__init__.py @@ -204,7 +204,7 @@ class Tinderbox(object): print "Unable to read build logs: %d: %s" % (errno, strerror) log.warning("Unable to read build logs %d: %s" % (errno, strerror)) else: - package.build_log = logfile.read() + package.attachments["build_log"] = logfile.read() logfile.close() del logfile try: @@ -213,10 +213,10 @@ class Tinderbox(object): print "Unable to read build environment: %d: %s" % (errno, strerror) log.warning("Unable to read build environment %d: %s" % (errno, strerror)) else: - package.build_env = envfile.read() + package.attachments["build_env"] = envfile.read() envfile.close() del envfile - + package.depends = [x[1] for x in deps_processed] package_infos.append(package.get_info()) for dep in group: @@ -348,8 +348,8 @@ class Package(object): self.version = version self.use_flags = use_flags self.content = None - self.build_log = None - self.build_env = None + self.attachments = {} + self.depends = None def get_info(self): @@ -365,8 +365,8 @@ class Package(object): if self.content is None: self.content = self.get_package_contents() pi.content = self.content - pi.build_log = self.build_log - pi.build_env = self.build_env + pi.attachments = self.attachments + pi.depends = self.depends return pi |