[Pkg-debile-commits] [debile-master] 28/126: nice

[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 3bc6a9064e406892d3439244cdd3c5051b5df1d3
Author: Paul Tagliamonte <tag at pault.ag>
Date:   Sun May 26 17:59:19 2013 -0400

    nice
---
 lucy/archive.py       |    2 +-
 lucy/incoming.py      |    4 ++--
 lucy/models/binary.py |    7 ++++---
 lucy/models/job.py    |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lucy/archive.py b/lucy/archive.py
index 7167d90..399ff0f 100644
--- a/lucy/archive.py
+++ b/lucy/archive.py
@@ -11,7 +11,7 @@ def uuid_to_path(uuid, base=None):
 
 def move_to_pool(config, package, changes, root=None):
     pool = config['pool']
-    uid = package['_id']
+    uid = package
     ret = uuid_to_path(uid, base=pool)
     path = os.path.join(pool, ret)
     if root:
diff --git a/lucy/incoming.py b/lucy/incoming.py
index cbb9f0a..41b9dfd 100644
--- a/lucy/incoming.py
+++ b/lucy/incoming.py
@@ -50,7 +50,7 @@ def accept_source(config, changes):
                  owner=who['_id'])
     obj.save()
 
-    path = move_to_pool(config, obj, changes)
+    path = move_to_pool(config, obj['_id'], changes)
     os.unlink(changes.get_filename())
 
     obj['path'] = path
@@ -98,7 +98,7 @@ def accept_binary(config, changes):
     binary.save()
     add_jobs(binary, 'binary', config['job_classes']['binary'])
 
-    path = move_to_pool(config, source, changes, root=arch)
+    path = move_to_pool(config, binary['source'], changes, root=arch)
     os.unlink(changes.get_filename())
     print("accept binary")
 
diff --git a/lucy/models/binary.py b/lucy/models/binary.py
index c3778df..17ef45f 100644
--- a/lucy/models/binary.py
+++ b/lucy/models/binary.py
@@ -6,13 +6,14 @@ class Binary(LucyObject):
 
     def __init__(self, job, arch, suite, binaries, builder, **kwargs):
         from lucy.models.job import Job
-        job = Job.load(job)['_id']
+        job = Job.load(job)
         if job['package_type'] != 'source':
             raise ValueError("Package from Job isn't a source package")
 
-        source = job['package']
+        if 'source' not in kwargs:
+            kwargs['source'] = job['package']
 
-        super(Binary, self).__init__(job=job,
+        super(Binary, self).__init__(job=job['_id'],
                                      arch=arch,
                                      suite=suite,
                                      builder=builder,
diff --git a/lucy/models/job.py b/lucy/models/job.py
index cb25ace..48ab3c3 100644
--- a/lucy/models/job.py
+++ b/lucy/models/job.py
@@ -1,4 +1,5 @@
 from lucy.models import LucyObject
+from lucy.models.machine import Machine
 
 
 class Job(LucyObject):
@@ -9,7 +10,6 @@ class Job(LucyObject):
 
         from lucy.models.source import Source
         from lucy.models.binary import Binary
-        from lucy.models.machine import Machine
 
         if package_type not in ["source", "binary"]:
             raise ValueError("package_type needs to be binary or source")

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