import threading
import glob
import apt_pkg
-from daklib.dbconn import DBConn, get_dbchange, get_policy_queue, session_wrapper, ChangePendingFile
+from daklib.dbconn import DBConn, get_dbchange, get_policy_queue, session_wrapper, ChangePendingFile, get_location, check_poolfile
from daklib.config import Config
from daklib.queue import Upload
from daklib.utils import poolify
found, poolfile = check_poolfile(os.path.join(poolname, chg_fn),
u.pkg.files[chg_fn]['size'],
u.pkg.files[chg_fn]["md5sum"],
- l,
+ l.location_id,
session=session)
if found is None:
log.critical("ERROR: Could not find %s in pool" % chg_fn)
sys.exit(1)
else:
- chg.changeslinks.append(poolfile)
+ chg.poolfiles.append(poolfile)
chg.files = files
session.commit()
-
+
except KeyboardInterrupt:
print("Caught C-c; terminating.")
utils.warn("Caught C-c; terminating.")