if not cnf.has_key('Override-Disparity::Options::Suite'):
cnf['Override-Disparity::Options::Suite'] = 'unstable'
- apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
- Options = cnf.SubTree('Override-Disparity::Options')
+ apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+ Options = cnf.subtree('Override-Disparity::Options')
if Options['help']:
usage()
depends = {}
session = DBConn().session()
- suite = Options['suite']
- components = cnf.ValueList('Suite::%s::Components' % suite)
- arches = set([x.arch_string for x in get_suite_architectures(suite)])
+ suite_name = Options['suite']
+ suite = get_suite(suite_name, session)
+ if suite is None:
+ utils.fubar("Unknown suite '{0}'".format(suite_name))
+ components = get_component_names(session)
+ arches = set([x.arch_string for x in get_suite_architectures(suite_name)])
arches -= set(['source', 'all'])
for arch in arches:
for component in components:
- Packages = utils.get_packages_from_ftp(cnf['Dir::Root'], suite, component, arch)
- while Packages.Step():
- package = Packages.Section.Find('Package')
- dep_list = Packages.Section.Find('Depends')
+ Packages = utils.get_packages_from_ftp(suite.archive.path, suite_name, component, arch)
+ while Packages.step():
+ package = Packages.section.find('Package')
+ dep_list = Packages.section.find('Depends')
if Options['package'] and package != Options['package']:
continue
if dep_list:
- for d in apt_pkg.ParseDepends(dep_list):
+ for d in apt_pkg.parse_depends(dep_list):
for i in d:
if not depends.has_key(package):
depends[package] = set()
JOIN bin_associations ba ON ba.bin = b.id
WHERE s.suite_name = '%s'
AND ba.suite = s.id
- AND p.level <> 0""" % suite
+ AND p.level <> 0""" % suite_name
packages = session.execute(query)
out = {}
if not out.has_key(d):
out[d] = {}
out[d]['priority'] = priorities[d][1]
- out[d]['maintainer'] = priorities[d][2]
+ out[d]['maintainer'] = unicode(priorities[d][2], 'utf-8')
out[d]['priority'] = priorities[d][1]
priorities[d][3] = False
if not out[d].has_key('dependency'):
out[d]['dependency'] = {}
out[d]['dependency'][p] = priorities[p][1]
- yaml.dump(out, outfile, default_flow_style=False)
+ yaml.safe_dump(out, outfile, default_flow_style=False)
if Options.has_key('file'):
outfile.close()