merge master

diff --cc debian_build.py
index 3c62f36b13b7b222221f83d82b5cea88091aeb34,75355110daa1ae88d7ecb4c9a44c39cbab3f2928..244bff1d7320d2b6e4db4c90b087998babcd4417
--- 1/debian_build.py
--- 2/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()