From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 26 Sep 2012 15:45:17 +0000 (+0200)
Subject: merge master
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6d642f9e6057faec1f04f911c9d5bf957aade8b2;p=profitbricks%2Fjenkins-build-scripts.git

merge master
---

6d642f9e6057faec1f04f911c9d5bf957aade8b2
diff --cc debian_build.py
index 3c62f36,7535511..244bff1
--- a/debian_build.py
+++ b/debian_build.py
@@@ -202,7 -221,7 +214,7 @@@ def add_package_instance(origin, job_na
          #logger.debug('package: %s' %(package))
          db_package_id = db_add_package (con, package)
          #logger.debug("INSERT success package %s" % package)
-         db_package_instance_id = db_add_package_instance (con, db_package_id, db_origin_id, db_build_id, version)
 -        db_add_package_instance (con, db_package_id, db_origin_id, db_build_result_id, version)
++        db_package_instance_id = db_add_package_instance (con, db_package_id, db_origin_id, db_build_result_id, version)
          logger.debug("INSERT success package version %s %s" %( package,version))
      #logger.debug('Cmd returned with status %d' %(cmdobj.returncode))
      con.commit()