From 19d2c81f6fd652b12ac001cdef457dd42a12c998 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 14 Jun 2008 15:11:31 -0300 Subject: [PATCH] dak/import_archive.py: Add support to udeb packages --- ChangeLog | 2 ++ dak/import_archive.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3957281d..d2d99e04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2008-06-14 Otavio Salvador + * dak/import_archive.py: Add support to udeb packages + * dak/control_suite.py (main): Handle SystemError exception in case of a incompatible commandline parameter diff --git a/dak/import_archive.py b/dak/import_archive.py index 203221be..4432ff1a 100755 --- a/dak/import_archive.py +++ b/dak/import_archive.py @@ -433,8 +433,12 @@ def process_packages (filename, suite, component, archive): if not source_version: source_version = version filename = Scanner.Section["filename"] + if filename.endswith(".deb"): + type = "deb" + else: + type = "udeb" location = get_location_path(filename.split('/')[0]) - location_id = database.get_location_id (location, component, archive) + location_id = database.get_location_id (location, component.replace("/debian-installer", ""), archive) filename = poolify (filename, location) if architecture == "all": filename = re_arch_from_filename.sub("binary-all", filename) @@ -443,7 +447,6 @@ def process_packages (filename, suite, component, archive): size = Scanner.Section["size"] md5sum = Scanner.Section["md5sum"] files_id = get_or_set_files_id (filename, size, md5sum, location_id) - type = "deb"; # FIXME cache_key = "%s_%s_%s_%d_%d_%d_%d" % (package, version, repr(source_id), architecture_id, location_id, files_id, suite_id) if not arch_all_cache.has_key(cache_key): arch_all_cache[cache_key] = 1 @@ -566,7 +569,9 @@ Please read the documentation before running this script. process_packages (packages, suite, "", server) elif type == "legacy" or type == "pool": for suite in Cnf.ValueList("Location::%s::Suites" % (location)): - for component in Cnf.SubTree("Component").List(): + udeb_components = map(lambda x: x+"/debian-installer", + Cnf.ValueList("Suite::%s::UdebComponents" % suite)) + for component in Cnf.SubTree("Component").List() + udeb_components: architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite))) for architecture in architectures: -- 2.39.2