From: Mark Hymers Date: Sun, 15 Nov 2009 18:42:15 +0000 (+0000) Subject: fill in the changes files tables when moving to a queue X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7f4f39d244e3282303015c9ff4a116252a64613;p=dak fill in the changes files tables when moving to a queue Signed-off-by: Mark Hymers --- diff --git a/dak/process_upload.py b/dak/process_upload.py index 33fff0dc..ab9a3197 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -293,12 +293,14 @@ def action(u, session): if not chg: chg = u.pkg.add_known_changes(holding.holding_dir, session=session) package_to_queue(u, summary, short_summary, policyqueue, chg, session) + chg.upload_into_db(u, holding.holding_dir) session.commit() u.remove() elif answer == queuekey: if not chg: chg = u.pkg.add_known_changes(holding.holding_dir, session=session) QueueInfo[qu]["process"](u, summary, short_summary, chg, session) + chg.upload_into_db(u, holding.holding_dir) session.commit() u.remove() elif answer == 'Q': diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 7047f59b..4e54a327 100644 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -1437,6 +1437,60 @@ class DBChange(object): def __repr__(self): return '' % self.changesname + def upload_into_db(self, u, path): + cnf = Config() + session = DBConn().session().object_session(self) + + files = [] + for chg_fn, entry in u.pkg.files.items(): + try: + f = open(os.path.join(path, chg_fn)) + cpf = ChangePendingFile() + cpf.filename = chg_fn + cpf.size = entry['size'] + cpf.md5sum = entry['md5sum'] + + if entry.has_key('sha1sum'): + cpf.sha1sum = entry['sha1sum'] + else: + f.seek(0) + cpf.sha1sum = apt_pkg.sha1sum(f) + + if entry.has_key('sha256sum'): + cpf.sha256sum = entry['sha256sum'] + else: + f.seek(0) + cpf.sha256sum = apt_pkg.sha256sum(f) + + session.add(cpf) + files.append(cpf) + f.close() + + except IOError: + # Can't find the file, try to look it up in the pool + from utils import poolify + poolname = poolify(entry["source"], entry["component"]) + l = get_location(cnf["Dir::Pool"], entry["component"], session=session) + + found, poolfile = check_poolfile(os.path.join(poolname, chg_fn), + entry['size'], + entry["md5sum"], + l.location_id, + session=session) + + if found is None: + Logger.log(["E: Found multiple files for pool (%s) for %s" % % (chg_fn, entry["component"])) + elif found is False and poolfile is not None: + Logger.log(["E: md5sum/size mismatch for %s in pool" % % (chg_fn)) + else: + if poolfile is None: + Logger.log(["E: Could not find %s in pool" % % (chg_fn)) + else: + chg.poolfiles.append(poolfile) + + chg.files = files + + def clean_from_queue(self): session = DBConn().session().object_session(self)