# Don't remove this, we re-export the exceptions to scripts which import us
from sqlalchemy.exc import *
+from sqlalchemy.orm.exc import NoResultFound
# Only import Config until Queue stuff is changed to store its config
# in the database
session = kwargs.get('session')
# No session specified as last argument or in kwargs, create one.
- if session is None and len(args) == len(getargspec(fn)[0]) - 1:
+ if session is None and len(args) <= len(getargspec(fn)[0]) - 1:
private_transaction = True
kwargs['session'] = DBConn().session()
# We created a session; close it.
kwargs['session'].close()
+ wrapped.__doc__ = fn.__doc__
+ wrapped.func_name = fn.func_name
+
return wrapped
################################################################################
q = session.query(Architecture).filter_by(arch_string=architecture)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_architecture')
pass
def __repr__(self):
- return '<Archive %s>' % self.name
+ return '<Archive %s>' % self.archive_name
__all__.append('Archive')
q = session.query(Archive).filter_by(archive_name=archive)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_archive')
@return: list of Suite objects for the given package
"""
- ret = session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all()
-
- return ret
+ return session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all()
__all__.append('get_suites_binary_in')
q = session.query(DBBinary).filter_by(binary_id=id)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_binary_from_id')
@return: list of DBBinary objects for the given name (may be empty)
"""
- ret = session.query(DBBinary).filter_by(source_id=source_id).all()
-
- return ret
+ return session.query(DBBinary).filter_by(source_id=source_id).all()
__all__.append('get_binaries_from_source_id')
AND su.suite_name=:suitename
ORDER BY b.version DESC"""
- ret = session.execute(sql, {'package': package, 'suitename': suitename})
-
- return ret
+ return session.execute(sql, {'package': package, 'suitename': suitename})
__all__.append('get_binary_from_name_suite')
vals = {'package': package, 'suitename': suitename, 'arch': arch}
- ret = session.execute(query, vals)
-
- return ret
+ return session.execute(query, vals)
__all__.append('get_binary_components')
q = session.query(Component).filter_by(component_name=component)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_component')
privatetrans = True
q = session.query(ContentFilename).filter_by(filename=filename)
- if q.count() < 1:
+
+ try:
+ ret = q.one().cafilename_id
+ except NoResultFound:
cf = ContentFilename()
cf.filename = filename
session.add(cf)
else:
session.flush()
ret = cf.cafilename_id
- else:
- ret = q.one().cafilename_id
if privatetrans:
session.close()
contents_q += " ORDER BY fn"
- ret = session.execute(contents_q, vals)
-
- return ret
+ return session.execute(contents_q, vals)
__all__.append('get_contents')
privatetrans = True
q = session.query(ContentFilepath).filter_by(filepath=filepath)
- if q.count() < 1:
+
+ try:
+ ret = q.one().cafilepath_id
+ except NoResultFound:
cf = ContentFilepath()
cf.filepath = filepath
session.add(cf)
else:
session.flush()
ret = cf.cafilepath_id
- else:
- ret = q.one().cafilepath_id
if privatetrans:
session.close()
if poolfile_id is not None:
q = q.filter_by(poolfile_id=poolfile_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_dscfiles')
q = session.query(PoolFile).filter_by(file_id=file_id)
- if q.count() > 0:
- ret = q.one()
- else:
- ret = None
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_poolfile_by_id')
if location_id is not None:
q = q.join(Location).filter_by(location_id=location_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_poolfile_by_name')
# TODO: There must be a way of properly using bind parameters with %FOO%
q = session.query(PoolFile).filter(PoolFile.filename.like('%%%s%%' % filename))
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_poolfile_like_name')
privatetrans = True
q = session.query(Fingerprint).filter_by(fingerprint=fpr)
- if q.count() < 1:
+
+ try:
+ ret = q.one()
+ except NoResultFound:
fingerprint = Fingerprint()
fingerprint.fingerprint = fpr
session.add(fingerprint)
else:
session.flush()
ret = fingerprint
- else:
- ret = q.one()
if privatetrans:
session.close()
if component is not None:
q = q.join(Component).filter_by(component_name=component)
- if q.count() < 1:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_location')
privatetrans = True
q = session.query(Maintainer).filter_by(name=name)
- if q.count() < 1:
+ try:
+ ret = q.one()
+ except NoResultFound:
maintainer = Maintainer()
maintainer.name = name
session.add(maintainer)
else:
session.flush()
ret = maintainer
- else:
- ret = q.one()
if privatetrans:
session.close()
q = q.filter_by(package=package)
q = q.filter_by(version=version)
- ret = q.count() > 0
-
- return ret
+ return bool(q.count() > 0)
__all__.append('has_new_comment')
if version is not None: q = q.filter_by(version=version)
if comment_id is not None: q = q.filter_by(comment_id=comment_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_new_comments')
if not isinstance(overridetype, list): overridetype = [overridetype]
q = q.join(OverrideType).filter(OverrideType.overridetype.in_(overridetype))
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_override')
q = session.query(OverrideType).filter_by(overridetype=override_type)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_override_type')
q = session.query(Priority).filter_by(priority=priority)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_priority')
# TODO: Move into database as above
if conf.FindB("Dinstall::SecurityQueueBuild"):
# Copy it since the original won't be readable by www-data
+ import utils
utils.copy(src, dest)
else:
# Create a symlink to it
session.add(qb)
- # If the .orig.tar.gz is in the pool, create a symlink to
- # it (if one doesn't already exist)
- if changes.orig_tar_id:
- # Determine the .orig.tar.gz file name
- for dsc_file in changes.dsc_files.keys():
- if dsc_file.endswith(".orig.tar.gz"):
- filename = dsc_file
-
- dest = os.path.join(dest_dir, filename)
+ # If the .orig tarballs are in the pool, create a symlink to
+ # them (if one doesn't already exist)
+ for dsc_file in changes.dsc_files.keys():
+ # Skip all files except orig tarballs
+ if not re_is_orig_source.match(dsc_file):
+ continue
+ # Skip orig files not identified in the pool
+ if not (changes.orig_files.has_key(dsc_file) and
+ changes.orig_files[dsc_file].has_key("id")):
+ continue
+ orig_file_id = changes.orig_files[dsc_file]["id"]
+ dest = os.path.join(dest_dir, dsc_file)
# If it doesn't exist, create a symlink
if not os.path.exists(dest):
q = session.execute("SELECT l.path, f.filename FROM location l, files f WHERE f.id = :id and f.location = l.id",
- {'id': changes.orig_tar_id})
+ {'id': orig_file_id})
res = q.fetchone()
if not res:
- return "[INTERNAL ERROR] Couldn't find id %s in files table." % (changes.orig_tar_id)
+ return "[INTERNAL ERROR] Couldn't find id %s in files table." % (orig_file_id)
src = os.path.join(res[0], res[1])
os.symlink(src, dest)
"""
q = session.query(Queue).filter_by(queue_name=queuename)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_queue')
q = session.query(QueueBuild).filter_by(filename=filename)
q = q.join(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_queue_build')
"""
q = session.query(Section).filter_by(section=section)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_section')
@return: list of Suite objects for the given source
"""
- ret = session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all()
-
- return ret
+ return session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all()
__all__.append('get_suites_source_in')
if dm_upload_allowed is not None:
q = q.filter_by(dm_upload_allowed=dm_upload_allowed)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_sources_from_name')
q = q.join('source').filter_by(source=source)
q = q.join('suite').filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- # ???: Maybe we should just return the SrcAssociation object instead
- ret = q.one().source
-
- return ret
+ try:
+ return q.one().source
+ except NoResultFound:
+ return None
__all__.append('get_source_in_suite')
################################################################################
+class SrcFormat(object):
+ def __init__(self, *args, **kwargs):
+ pass
+
+ def __repr__(self):
+ return '<SrcFormat %s>' % (self.format_name)
+
+__all__.append('SrcFormat')
+
+################################################################################
+
class SrcUploader(object):
def __init__(self, *args, **kwargs):
pass
q = q.join(Architecture).filter_by(arch_string=architecture)
q = q.join(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_suite_architecture')
q = session.query(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_suite')
q = q.order_by('arch_string')
+ return q.all()
+
+__all__.append('get_suite_architectures')
+
+################################################################################
+
+class SuiteSrcFormat(object):
+ def __init__(self, *args, **kwargs):
+ pass
+
+ def __repr__(self):
+ return '<SuiteSrcFormat (%s, %s)>' % (self.suite_id, self.src_format_id)
+
+__all__.append('SuiteSrcFormat')
+
+def get_suite_src_formats(suite, session=None):
+ """
+ Returns list of allowed SrcFormat for C{suite}.
+
+ @type suite: str
+ @param suite: Suite name to search for
+
+ @type session: Session
+ @param session: Optional SQL session object (a temporary one will be
+ generated if not supplied)
+
+ @rtype: list
+ @return: the list of allowed source formats for I{suite}
+ """
+
+ privatetrans = False
+ if session is None:
+ session = DBConn().session()
+ privatetrans = True
+
+ q = session.query(SrcFormat)
+ q = q.join(SuiteSrcFormat)
+ q = q.join(Suite).filter_by(suite_name=suite)
+ q = q.order_by('format_name')
+
ret = q.all()
+ if privatetrans:
+ session.close()
+
return ret
-__all__.append('get_suite_architectures')
+__all__.append('get_suite_src_formats')
################################################################################
q = session.query(Uid).filter_by(uid=uidname)
- if q.count() < 1:
+ try:
+ ret = q.one()
+ except NoResultFound:
uid = Uid()
uid.uid = uidname
session.add(uid)
else:
session.flush()
ret = uid
- else:
- ret = q.one()
if privatetrans:
session.close()
q = session.query(Uid)
q = q.join(Fingerprint).filter_by(fingerprint=fpr)
- if q.count() != 1:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_uid_from_fingerprint')
self.tbl_section = Table('section', self.db_meta, autoload=True)
self.tbl_source = Table('source', self.db_meta, autoload=True)
self.tbl_src_associations = Table('src_associations', self.db_meta, autoload=True)
+ self.tbl_src_format = Table('src_format', self.db_meta, autoload=True)
self.tbl_src_uploaders = Table('src_uploaders', self.db_meta, autoload=True)
self.tbl_suite = Table('suite', self.db_meta, autoload=True)
self.tbl_suite_architectures = Table('suite_architectures', self.db_meta, autoload=True)
+ self.tbl_suite_src_formats = Table('suite_src_formats', self.db_meta, autoload=True)
self.tbl_uid = Table('uid', self.db_meta, autoload=True)
def __setupmappers(self):
source_id = self.tbl_src_associations.c.source,
source = relation(DBSource)))
+ mapper(SrcFormat, self.tbl_src_format,
+ properties = dict(src_format_id = self.tbl_src_format.c.id,
+ format_name = self.tbl_src_format.c.format_name))
+
mapper(SrcUploader, self.tbl_src_uploaders,
properties = dict(uploader_id = self.tbl_src_uploaders.c.id,
source_id = self.tbl_src_uploaders.c.source,
arch_id = self.tbl_suite_architectures.c.architecture,
architecture = relation(Architecture)))
+ mapper(SuiteSrcFormat, self.tbl_suite_src_formats,
+ properties = dict(suite_id = self.tbl_suite_src_formats.c.suite,
+ suite = relation(Suite, backref='suitesrcformats'),
+ src_format_id = self.tbl_suite_src_formats.c.src_format,
+ src_format = relation(SrcFormat)))
+
mapper(Uid, self.tbl_uid,
properties = dict(uid_id = self.tbl_uid.c.id,
fingerprint = relation(Fingerprint)))
projects / dak.git / blobdiff