def get_pkg(package, version, architecture, session):
if architecture == 'source':
- q = session.query(DBSource).filter_by(source=package, version=version)
+ q = session.query(DBSource).filter_by(source=package, version=version) \
+ .join(DBSource.poolfile)
else:
q = session.query(DBBinary).filter_by(package=package, version=version) \
- .join(DBBinary.architecture).filter(Architecture.arch_string.in_([architecture, 'all']))
+ .join(DBBinary.architecture).filter(Architecture.arch_string.in_([architecture, 'all'])) \
+ .join(DBBinary.poolfile)
pkg = q.first()
if pkg is None:
else:
transaction.copy_binary(pkg, suite, component)
- Logger.log(["added", " ".join(key)])
+ Logger.log(["added", suite.suite_name, " ".join(key)])
# Check to see which packages need removed and remove them
for key, pkid in current.iteritems():
session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
else:
session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
- Logger.log(["removed", " ".join(key), pkid])
+ Logger.log(["removed", suite.suite_name, " ".join(key), pkid])
session.commit()
if action == "set" and not suite.allowcsset:
if force:
- utils.warn("Would not normally allow setting suite {0} (allowsetcs is FALSE), but --force used".format(suite_name))
+ utils.warn("Would not normally allow setting suite {0} (allowcsset is FALSE), but --force used".format(suite_name))
else:
- utils.fubar("Will not reset suite {0} due to its database configuration (allowsetcs is FALSE)".format(suite_name))
+ utils.fubar("Will not reset suite {0} due to its database configuration (allowcsset is FALSE)".format(suite_name))
if file_list:
for f in file_list: