import sys
import os
-import tempfile
import logging
import math
import gzip
# get all the arches delivered for a given suite
# this should probably exist somehere common
-arches_q = """PREPARE arches_q as
+arches_q = """PREPARE arches_q(int) as
SELECT s.architecture, a.arch_string
FROM suite_architectures s
JOIN architecture a ON (s.architecture=a.id)
WHERE suite = $1"""
# find me the .deb for a given binary id
-debs_q = """PREPARE debs_q as
+debs_q = """PREPARE debs_q(int, int) as
SELECT b.id, f.filename FROM bin_assoc_by_arch baa
JOIN binaries b ON baa.bin=b.id
JOIN files f ON b.file=f.id
AND arch = $2"""
# ask if we already have contents associated with this binary
-olddeb_q = """PREPARE olddeb_q as
+olddeb_q = """PREPARE olddeb_q(int) as
SELECT 1 FROM content_associations
WHERE binary_pkg = $1
LIMIT 1"""
# find me all of the contents for a given .deb
-contents_q = """PREPARE contents_q as
+contents_q = """PREPARE contents_q(int,int,int,int) as
SELECT (p.path||'/'||n.file) AS fn,
comma_separated_list(s.section||'/'||b.package)
FROM content_associations c
JOIN section s ON (s.id=o.section)
WHERE (b.architecture = $1 OR b.architecture = $2)
AND ba.suite = $3
- AND o.suite = $4
+ AND o.suite = $3
AND b.type = 'deb'
- AND o.type = '7'
+ AND o.type = $4
GROUP BY fn
ORDER BY fn"""
-# find me all of the contents for a given .udeb
-udeb_contents_q = """PREPARE udeb_contents_q as
+udeb_contents_q = """PREPARE udeb_contents_q(int,int,int,int,int) as
SELECT (p.path||'/'||n.file) as fn,
comma_separated_list(s.section||'/'||b.package)
FROM content_associations c
JOIN bin_associations ba ON (b.id=ba.bin)
JOIN override o ON (o.package=b.package)
JOIN section s ON (s.id=o.section)
- WHERE s.id = $1
- AND ba.suite = $2
- AND o.suite = $3
+ WHERE (b.architecture = $1 OR b.architecture = $2)
+ AND s.id = $3
+ AND ba.suite = $4
+ AND o.suite = $4
AND b.type = 'udeb'
- AND o.type = '8'
+ AND o.type = $5
GROUP BY fn
ORDER BY fn"""
+
# clear out all of the temporarily stored content associations
# this should be run only after p-a has run. after a p-a
# run we should have either accepted or rejected every package
def __init__(self):
self.header = None
+ def reject(self, message):
+ log.error("E: %s" % message)
+
def _getHeader(self):
"""
Internal method to return the header for Contents.gz files
return
num_tabs = max(1,
- int(math.ceil((self._goal_column - len(contents[0])) / 8)))
+ int(math.ceil((self._goal_column - len(contents[0])-1) / 8)))
f.write(contents[0] + ( '\t' * num_tabs ) + contents[-1] + "\n")
finally:
pooldir = Config()[ 'Dir::Pool' ]
cursor = DBConn().cursor();
- cursor.execute( debs_q )
- cursor.execute( olddeb_q )
- cursor.execute( arches_q )
+ DBConn().prepare("debs_q",debs_q)
+ DBConn().prepare("olddeb_q",olddeb_q)
+ DBConn().prepare("arches_q",arches_q)
suites = self._suites()
for suite in [i.lower() for i in suites]:
cursor1.execute( "EXECUTE olddeb_q(%d)" % (deb[0] ) )
old = cursor1.fetchone()
if old:
- log.debug( "already imported: %s" % deb[1] )
+ log.debug( "already imported: %s" % (deb[1]) )
else:
+ log.debug( "scanning: %s" % (deb[1]) )
debfile = os.path.join( pooldir, deb[1] )
if os.path.exists( debfile ):
- Binary(debfile).scan_package( deb[0] )
+ Binary(debfile, self.reject).scan_package(deb[0],True)
else:
- log.error( "missing .deb: %s" % deb[1] )
+ log.error("missing .deb: %s" % deb[1])
def generate(self):
"""
"""
cursor = DBConn().cursor();
- cursor.execute( arches_q )
- cursor.execute( contents_q )
- cursor.execute( udeb_contents_q )
+ DBConn().prepare( "arches_q", arches_q )
+ DBConn().prepare( "contents_q", contents_q )
+ DBConn().prepare( "udeb_contents_q", udeb_contents_q )
+
+ debtype_id=DBConn().get_override_type_id("deb")
+ udebtype_id=DBConn().get_override_type_id("udeb")
suites = self._suites()
arch_all_id = DBConn().get_architecture_id("all")
for arch_id in arch_list:
- cursor.execute( "EXECUTE contents_q(%d,%d,%d,%d)" % (arch_id[0], arch_all_id, suite_id, suite_id))
+ cursor.execute("EXECUTE contents_q(%d,%d,%d,%d)" % (arch_id[0], arch_all_id, suite_id, debtype_id))
self._write_content_file(cursor, "dists/%s/Contents-%s.gz" % (suite, arch_id[1]))
# The MORE fun part. Ok, udebs need their own contents files, udeb, and udeb-nf (not-free)
# This is HORRIBLY debian specific :-/
- for section_id, fn_pattern in [("debian-installer","dists/%s/Contents-udeb.gz"),
- ("non-free/debian-installer", "dists/%s/Contents-udeb-nf.gz")]:
+ for section, fn_pattern in [("debian-installer","dists/%s/Contents-udeb-%s.gz"),
+ ("non-free/debian-installer", "dists/%s/Contents-udeb-nf-%s.gz")]:
+
+ for arch_id in arch_list:
+ section_id = DBConn().get_section_id(section) # all udebs should be here)
+ if section_id != -1:
+ cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d,%d,%d)" % (arch_id[0], arch_all_id, section_id, suite_id, udebtype_id))
- section_id = DBConn().get_section_id(section_id) # all udebs should be here)
- if section_id != -1:
- cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d)" % (section_id, suite_id, suite_id))
- self._write_content_file(cursor, fn_pattern % suite)
+ self._write_content_file(cursor, fn_pattern % (suite, arch_id[1]))
################################################################################
'cruft' : Contents.cruft,
}
+ args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv)
+
+ if (len(args) < 1) or not commands.has_key(args[0]):
+ usage()
+
+ if cnf.has_key("%s::%s" % (options_prefix,"Help")):
+ usage()
+
level=logging.INFO
if cnf.has_key("%s::%s" % (options_prefix,"Quiet")):
level=logging.ERROR
format='%(asctime)s %(levelname)s %(message)s',
stream = sys.stderr )
- args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv)
-
- if (len(args) < 1) or not commands.has_key(args[0]):
- usage()
-
- if cnf.has_key("%s::%s" % (options_prefix,"Help")):
- usage()
-
commands[args[0]](Contents())
if __name__ == '__main__':
projects / dak.git / blobdiff