From 537af68babed460e2d54d7ac313306bd402eea6b Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 4 May 2008 02:08:24 +0200 Subject: [PATCH 1/1] Use "import daklib.foo as foo" style --- ChangeLog | 2 ++ dak/import_users_from_passwd.py | 6 +++--- dak/init_db.py | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 14 deletions(-) mode change 100644 => 100755 dak/import_users_from_passwd.py mode change 100644 => 100755 dak/init_db.py diff --git a/ChangeLog b/ChangeLog index 1d56d45e..5014a41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * dak/generate_releases.py: likewise * dak/import_archive.py: likewise * dak/import_ldap_fingerprints.py: likewise + * dak/import_users_from_passwd.py: likewise + * dak/init_db.py: likewise * dak/check_archive.py (check_files_not_symlinks): Remove long-time unused and commented code. Import stuff from daklib as diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py old mode 100644 new mode 100755 index fa347722..af9d1239 --- a/dak/import_users_from_passwd.py +++ b/dak/import_users_from_passwd.py @@ -31,7 +31,7 @@ import pg, pwd, sys import apt_pkg -import daklib.utils +import daklib.utils as utils ################################################################################ @@ -54,7 +54,7 @@ Sync PostgreSQL's users with system users. def main (): global Cnf, projectB - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('n', "no-action", "Import-Users-From-Passwd::Options::No-Action"), ('q', "quiet", "Import-Users-From-Passwd::Options::Quiet"), @@ -70,7 +70,7 @@ def main (): if Options["Help"]: usage() elif arguments: - daklib.utils.warn("dak import-users-from-passwd takes no non-option arguments.") + utils.warn("dak import-users-from-passwd takes no non-option arguments.") usage(1) projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) diff --git a/dak/init_db.py b/dak/init_db.py old mode 100644 new mode 100755 index 3185b6ed..16a8d8ba --- a/dak/init_db.py +++ b/dak/init_db.py @@ -21,8 +21,8 @@ import pg, sys import apt_pkg -import daklib.database -import daklib.utils +import daklib.database as database +import daklib.utils as utils ################################################################################ @@ -101,9 +101,9 @@ def do_location(): projectB.query("DELETE FROM location") for location in Cnf.SubTree("Location").List(): location_config = Cnf.SubTree("Location::%s" % (location)) - archive_id = daklib.database.get_archive_id(location_config["Archive"]) + archive_id = database.get_archive_id(location_config["Archive"]) if archive_id == -1: - daklib.utils.fubar("Archive '%s' for location '%s' not found." + utils.fubar("Archive '%s' for location '%s' not found." % (location_config["Archive"], location)) location_type = location_config.get("type") if location_type == "legacy-mixed": @@ -112,13 +112,13 @@ def do_location(): % (location, archive_id, location_config["type"])) elif location_type == "legacy" or location_type == "pool": for component in Cnf.SubTree("Component").List(): - component_id = daklib.database.get_component_id(component) + component_id = database.get_component_id(component) projectB.query("INSERT INTO location (path, component, " "archive, type) VALUES ('%s', %d, %d, '%s')" % (location, component_id, archive_id, location_type)) else: - daklib.utils.fubar("E: type '%s' not recognised in location %s." + utils.fubar("E: type '%s' not recognised in location %s." % (location_type, location)) projectB.query("COMMIT WORK") @@ -136,9 +136,9 @@ def do_suite(): "description) VALUES ('%s', %s, %s, %s)" % (suite.lower(), version, origin, description)) for architecture in Cnf.ValueList("Suite::%s::Architectures" % (suite)): - architecture_id = daklib.database.get_architecture_id (architecture) + architecture_id = database.get_architecture_id (architecture) if architecture_id < 0: - daklib.utils.fubar("architecture '%s' not found in architecture" + utils.fubar("architecture '%s' not found in architecture" " table for suite %s." % (architecture, suite)) projectB.query("INSERT INTO suite_architectures (suite, " @@ -196,7 +196,7 @@ def main (): global Cnf, projectB - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() arguments = [('h', "help", "Init-DB::Options::Help")] for i in [ "help" ]: if not Cnf.has_key("Init-DB::Options::%s" % (i)): @@ -208,12 +208,12 @@ def main (): if options["Help"]: usage() elif arguments: - daklib.utils.warn("dak init-db takes no arguments.") + utils.warn("dak init-db takes no arguments.") usage(exit_code=1) projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + database.init(Cnf, projectB) do_archive() do_architecture() -- 2.39.2