Error out when we are unable to find a source id for a file we want to install. Shoul...

diff --git a/ChangeLog b/ChangeLog
index 0556396625197f235a3baa78b7252bceb0a098b6..b6b1ac90a7d9a5290869ae26b2bd6e401c435016 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-07  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/process_accepted.py (install): Error out with the new
+       exception if we dont know the source package for a file we want to
+       install. Shouldn't ever hit us, but better safe than sorry.
+
+       * daklib/dak_exceptions.py (dakerrors): new exception - no source field.
+
 2008-08-05  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/cron.unchecked: disable the ssh-move insanity (and

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index e99c35b359bdce6cec908225e32c1f20ce42ef5e..94c2ea3074980e540f4b4adf0058fc787dc8c1f5 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -35,6 +35,7 @@ from daklib import database
 from daklib import logging
 from daklib import queue
 from daklib import utils
+from daklib.dak_exceptions import *
 
 ###############################################################################
 
@@ -354,8 +355,7 @@ def install ():
                 projectB.query("INSERT INTO binaries (package, version, maintainer, source, architecture, file, type, sig_fpr) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d)"
                                % (package, version, maintainer_id, source_id, architecture_id, files[file]["files id"], type, fingerprint_id))
             else:
-                projectB.query("INSERT INTO binaries (package, version, maintainer, architecture, file, type, sig_fpr) VALUES ('%s', '%s', %d, %d, %d, '%s', %d)"
-                               % (package, version, maintainer_id, architecture_id, files[file]["files id"], type, fingerprint_id))
+                raise NoSourceFieldError, "Unable to find a source id for %s (%s), %s, file %s, type %s, signed by %s" % (package, version, architecture, file, type, sig_fpr)
             for suite in changes["distribution"].keys():
                 suite_id = database.get_suite_id(suite)
                 projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, currval('binaries_id_seq'))" % (suite_id))

diff --git a/daklib/dak_exceptions.py b/daklib/dak_exceptions.py
index b52e0657f6285629f9b540cd72908335de1989b6..4e795461532e6b6284057b5a961ac88d329c83be 100644 (file)
--- a/daklib/dak_exceptions.py
+++ b/daklib/dak_exceptions.py
@@ -48,7 +48,8 @@ dakerrors = {
     "FileExistsError":     """Exception raised when destination file exists.""",
     "SendmailFailedError": """Exception raised when Sendmail invocation failed.""",
     "NoFreeFilenameError": """Exception raised when no alternate filename was found.""",
-    "TransitionsError":    """Exception raised when transitions file can't be parsed."""
+    "TransitionsError":    """Exception raised when transitions file can't be parsed.""",
+    "NoSourceFieldError":  """Exception raised - we cant find the source - wtf?"""
 }
 
 def construct_dak_exception(name, description):