self.tmpdir = None
self.chunks = None
self.wrapped_reject = reject
+ # Store rejects for later use
+ self.rejects = []
def reject(self, message):
"""
otherwise send it to stderr.
"""
print >> sys.stderr, message
+ self.rejects.append(message)
if self.wrapped_reject:
self.wrapped_reject(message)
except:
print >> sys.stderr, "E: %s has non-unicode filename: %s" % (package,tarinfo.name)
+ result = True
+
except:
traceback.print_exc()
result = False
os.chdir(cwd)
+ return result
+
__all__.append('Binary')
def copy_temporary_contents(package, version, archname, deb, reject, session=None):
contents stored in pending_content_associations
"""
- # first see if contents exist:
cnf = Config()
+ privatetrans = False
if session is None:
session = DBConn().session()
+ privatetrans = True
arch = get_architecture(archname, session=session)
+ # first see if contents exist:
in_pcaq = """SELECT 1 FROM pending_content_associations
WHERE package=:package
AND version=:version
'version': version,
'archid': arch.arch_id}
- exists = True
+ exists = None
check = session.execute(in_pcaq, vals)
if check.rowcount > 0:
message = utils.TemplateSubst(subst, cnf["Dir::Templates"]+"/missing-contents")
utils.send_mail(message)
- exists = Binary(deb, reject).scan_package()
+ # Temporarily disable contents storage until we re-do the table layout
+ #exists = Binary(deb, reject).scan_package()
if exists:
sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)
sql = """DELETE from pending_content_associations
WHERE package=:package AND version=:version AND architecture=:archid"""
session.execute(sql, vals)
+ session.commit()
+
+ if privatetrans:
+ session.close()
return exists