X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=ff890377db47f2e8abea926cfa30b51a9d8de16a;hb=400aca3f47b5b52b58077e30c8c2d0fa9921034e;hp=f709e806f3492f0b8caae6d9352c02d6bb066db5;hpb=058d7d213729fa48a46bf5a74bb681f3e9de5550;p=dak.git diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index f709e806..ff890377 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -34,6 +34,7 @@ def usage(): print """Usage: dak generate-packages-sources2 [OPTIONS] Generate the Packages/Sources files + -a, --archive=ARCHIVE process suites in ARCHIVE -s, --suite=SUITE process this suite Default: All suites not marked 'untouchable' -f, --force Allow processing of untouchable suites @@ -311,6 +312,7 @@ def main(): cnf = Config() Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"), + ('a','archive','Generate-Packages-Sources::Options::Archive','HasArg'), ('s',"suite","Generate-Packages-Sources::Options::Suite"), ('f',"force","Generate-Packages-Sources::Options::Force"), ('o','option','','ArbItem')] @@ -329,7 +331,7 @@ def main(): logger = daklog.Logger('generate-packages-sources2') - from daklib.dbconn import Component, DBConn, get_suite, Suite + from daklib.dbconn import Component, DBConn, get_suite, Suite, Archive session = DBConn().session() session.execute("SELECT add_missing_description_md5()") session.commit() @@ -344,7 +346,10 @@ def main(): print "I: Cannot find suite %s" % s logger.log(['Cannot find suite %s' % s]) else: - suites = session.query(Suite).filter(Suite.untouchable == False).all() + query = session.query(Suite).filter(Suite.untouchable == False) + if 'Archive' in Options: + query = query.join(Suite.archive).filter(Archive.archive_name==Options['Archive']) + suites = query.all() force = Options.has_key("Force") and Options["Force"]