[Pkg-debile-commits] [debile-slave] 46/100: meh. I hate this.

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch master
in repository debile-slave.

commit 6d165cb8782b479d46c8bc63a6cfa1f0a2a8c0e5
Author: Paul Tagliamonte <tag at pault.ag>
Date:   Thu May 30 20:32:25 2013 -0400

    meh. I hate this.
---
 ethel/commands/adequate.py |    2 +-
 ethel/commands/build.py    |   10 ++++++----
 ethel/daemon.py            |    3 ++-
 ethel/runners/adequate.py  |    2 +-
 ethel/runners/sbuild.py    |    3 +--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ethel/commands/adequate.py b/ethel/commands/adequate.py
index 6b8d37a..cdf014f 100644
--- a/ethel/commands/adequate.py
+++ b/ethel/commands/adequate.py
@@ -1,7 +1,7 @@
 from ethel.runners.adequate import adequate
 
 
-def run(debs, package, firehose):
+def run(debs, package, job, firehose):
     if any((not x.endswith(".deb") for x in debs)):
         raise Exception("Non-deb given")
 
diff --git a/ethel/commands/build.py b/ethel/commands/build.py
index 62310e6..a8d69b2 100644
--- a/ethel/commands/build.py
+++ b/ethel/commands/build.py
@@ -2,15 +2,17 @@ from ethel.runners.sbuild import sbuild
 from ethel.utils import upload
 
 
-def run(dsc, package, job):
+# target package firehose
+def run(dsc, package, job, firehose):
     suite = job['suite']
     arch = job['arch']
-    ftbfs, out, info = sbuild(dsc, suite, arch)
-    print(ftbfs, info)
-    # fluxbox_1.3.5-1_amd64.changes
+
+    info, out, ftbfs = sbuild(dsc, suite, arch)
+
     changes = "{source}_{version}_{arch}.changes".format(
         source=package['source'],
         version=package['version'],
         arch=arch)
+
     upload(changes, job['_id'])
     return (info, out, ftbfs)
diff --git a/ethel/daemon.py b/ethel/daemon.py
index 45af52b..180b0af 100644
--- a/ethel/daemon.py
+++ b/ethel/daemon.py
@@ -93,7 +93,8 @@ def iterate():
         with tdir() as fd:
             with cd(fd):
                 with checkout(package) as target:
-                    log, err = handler(target, package, firehose)
+                    firehose, log, err = handler(target, package,
+                                                 job, firehose)
 
                     type_ = {"sources": "source",
                              "binaries": "binary"}[package['_type']]
diff --git a/ethel/runners/adequate.py b/ethel/runners/adequate.py
index cd29aa0..c144da7 100644
--- a/ethel/runners/adequate.py
+++ b/ethel/runners/adequate.py
@@ -31,4 +31,4 @@ def adequate(chroot_name, packages, analysis):
             failed = True
             analysis.results.append(issue)
 
-        return failed, out
+        return analysis, failed, out
diff --git a/ethel/runners/sbuild.py b/ethel/runners/sbuild.py
index 3c59f44..cb45494 100644
--- a/ethel/runners/sbuild.py
+++ b/ethel/runners/sbuild.py
@@ -1,7 +1,6 @@
 from ethel.utils import safe_run, run_command, tdir
 
 from firehose.model import Issue, Message, File, Location, Stats, DebianBinary
-from storz.wrapper import generate_analysis
 import firehose.parsers.gcc as fgcc
 
 from contextlib import contextmanager
@@ -80,4 +79,4 @@ def sbuild(package, dist, arch):
     out, err = out.decode('utf-8'), err.decode('utf-8')
     info = parse_sbuild_log(out, sut=sut)
 
-    return ftbfs, out, info
+    return info, out, ftbfs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-slave.git