[Pkg-debile-commits] [debile-master] 41/126: more fiddling

[Sylvestre Ledru]

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

sylvestre pushed a commit to branch scan-build-html
in repository debile-master.

commit fca0ff5d7e210509493dc387e9926fb082cca3b8
Author: Paul Tagliamonte <tag at pault.ag>
Date:   Wed May 29 19:27:07 2013 -0400

    more fiddling
---
 eg/config.json        |    6 ++++++
 lucy/models/job.py    |   10 ++++++++++
 lucy/models/report.py |   20 +++++++++++++++-----
 lucy/server.py        |   12 ++++++------
 scripts/lucy-processd |    7 +++++++
 5 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/eg/config.json b/eg/config.json
index ea79aee..04eba90 100644
--- a/eg/config.json
+++ b/eg/config.json
@@ -36,6 +36,12 @@
             "owner": "paultag"
         },
         {
+            "_id": "chayot",
+            "auth": "password",
+            "gpg": "BDCF0DF8B500A91BFDD26103ED557BBBC1EB3C94", 
+            "owner": "paultag"
+        },
+        {
             "_id": "loki",
             "auth": "password",
             "gpg": null,
diff --git a/lucy/models/job.py b/lucy/models/job.py
index 3ee9954..419a6b4 100644
--- a/lucy/models/job.py
+++ b/lucy/models/job.py
@@ -34,6 +34,16 @@ class Job(LucyObject):
             package_type=package_type,
             **kwargs)
 
+    def get_package(self):
+        from lucy.models.source import Source
+        from lucy.models.binary import Binary
+
+        if self['package_type'] == 'binary':
+            return Binary.load(self['package'])
+
+        if self['package_type'] == 'source':
+            return Source.load(self['package'])
+
     def get_builder(self):
         builder = self.get('builder', None)
         if builder is None:
diff --git a/lucy/models/report.py b/lucy/models/report.py
index a3ed09a..fadd26e 100644
--- a/lucy/models/report.py
+++ b/lucy/models/report.py
@@ -14,21 +14,31 @@ class Report(LucyObject):
         if package_type not in ["source", "binary"]:
             raise ValueError("Bad package type")
 
+        loaded_package = None
         if package_type == 'source':
-            package = Source.load(package)
+            try:
+                loaded_package = Source.load(package)
+            except KeyError:
+                pass
 
         if package_type == 'binary':
-            package = Binary.load(package)
+            try:
+                loaded_package = Binary.load(package)
+            except KeyError:
+                pass
+
+        if loaded_package is None:
+            raise KeyError("No such package")
 
         builder = Machine.load(builder)['_id']
-        package = Package.load(package)['_id']
+
         job = Job.load(job)['_id']
 
         super(Report, self).__init__(package_type=package_type,
                                      builder=builder,
-                                     package=package,
+                                     package=loaded_package['_id'],
                                      report=report,
+                                     job=job,
                                      failed=failed,
                                      log=log,
-                                     job=job,
                                      **kwargs)
diff --git a/lucy/server.py b/lucy/server.py
index fc25519..fb414be 100644
--- a/lucy/server.py
+++ b/lucy/server.py
@@ -87,23 +87,23 @@ class LucyInterface(object):
         nj.save()
         return dict(nj)
 
-    def submit_report(self, report, log, package, package_type, job, failed):
+    def submit_report(self, report, log, job, failed):
         """
         Submit a report from a run.
 
         report - firehose lint job
         log - full text of the run
-        package - related binary or source package
-        package_type - either source / binary
         job - job ID this relates to
         failed - was it able to complete properly
         """
+        job = Job.load(job)
+        package = job.get_package()
         report = Report(report=report,
                         log=log,
                         builder=get_builder_id(),
-                        package=package,
-                        package_type=package_type,
-                        job=job,
+                        package=package['_id'],
+                        package_type=job['package_type'],
+                        job=job['_id'],
                         failed=failed)
         return report.save()
 
diff --git a/scripts/lucy-processd b/scripts/lucy-processd
new file mode 100644
index 0000000..5aba1f4
--- /dev/null
+++ b/scripts/lucy-processd
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+inoticoming \
+    --foreground \
+    /srv/lucy.pault.ag/incoming/ \
+    --suffix .changes lucy-process-incoming \
+    \;

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