From 059b274225437414d435c9c9b3bb56a3d002ae28 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 4 May 2008 02:14:07 +0200 Subject: [PATCH] Use "import daklib.foo as foo" style --- ChangeLog | 2 ++ dak/init_dirs.py | 10 +++++----- dak/ls.py | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 15 deletions(-) mode change 100644 => 100755 dak/init_dirs.py mode change 100644 => 100755 dak/ls.py diff --git a/ChangeLog b/ChangeLog index 5014a41d..07064355 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * dak/import_ldap_fingerprints.py: likewise * dak/import_users_from_passwd.py: likewise * dak/init_db.py: likewise + * dak/init_dirs.py: likewise + * dak/ls.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/init_dirs.py b/dak/init_dirs.py old mode 100644 new mode 100755 index f9d3e805..f92515e2 --- a/dak/init_dirs.py +++ b/dak/init_dirs.py @@ -21,7 +21,7 @@ import os, sys import apt_pkg -import daklib.utils +import daklib.utils as utils ################################################################################ @@ -47,7 +47,7 @@ it.""" if os.path.exists(target): if not os.path.isdir(target): - daklib.utils.fubar("%s (%s) is not a directory." + utils.fubar("%s (%s) is not a directory." % (target, config_name)) else: print "Creating %s ..." % (target) @@ -118,7 +118,7 @@ def main (): global AptCnf, Cnf - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() arguments = [('h', "help", "Init-Dirs::Options::Help")] for i in [ "help" ]: if not Cnf.has_key("Init-Dirs::Options::%s" % (i)): @@ -130,11 +130,11 @@ def main (): if options["Help"]: usage() elif arguments: - daklib.utils.warn("dak init-dirs takes no arguments.") + utils.warn("dak init-dirs takes no arguments.") usage(exit_code=1) AptCnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(AptCnf, daklib.utils.which_apt_conf_file()) + apt_pkg.ReadConfigFileISC(AptCnf, utils.which_apt_conf_file()) create_directories() diff --git a/dak/ls.py b/dak/ls.py old mode 100644 new mode 100755 index 6ed845fe..2b445d82 --- a/dak/ls.py +++ b/dak/ls.py @@ -28,8 +28,8 @@ import os, pg, sys import apt_pkg -import daklib.database -import daklib.utils +import daklib.database as database +import daklib.utils as utils ################################################################################ @@ -61,7 +61,7 @@ ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g. def main (): global Cnf, projectB - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('a', "architecture", "Ls::Options::Architecture", "HasArg"), ('b', "binarytype", "Ls::Options::BinaryType", "HasArg"), @@ -85,29 +85,29 @@ def main (): if Options["Help"]: usage() if not packages: - daklib.utils.fubar("need at least one package name as an argument.") + utils.fubar("need at least one package name as an argument.") projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + database.init(Cnf, projectB) # If cron.daily is running; warn the user that our output might seem strange if os.path.exists(os.path.join(Cnf["Dir::Root"], "Archive_Maintenance_In_Progress")): - daklib.utils.warn("Archive maintenance is in progress; database inconsistencies are possible.") + utils.warn("Archive maintenance is in progress; database inconsistencies are possible.") # Handle buildd maintenance helper options if Options["GreaterOrEqual"] or Options["GreaterThan"]: if Options["GreaterOrEqual"] and Options["GreaterThan"]: - daklib.utils.fubar("-g/--greaterorequal and -G/--greaterthan are mutually exclusive.") + utils.fubar("-g/--greaterorequal and -G/--greaterthan are mutually exclusive.") if not Options["Suite"]: Options["Suite"] = "unstable" # Parse -a/--architecture, -c/--component and -s/--suite (con_suites, con_architectures, con_components, check_source) = \ - daklib.utils.parse_args(Options) + utils.parse_args(Options) if Options["BinaryType"]: if Options["BinaryType"] != "udeb" and Options["BinaryType"] != "deb": - daklib.utils.fubar("Invalid binary type. 'udeb' and 'deb' recognised.") + utils.fubar("Invalid binary type. 'udeb' and 'deb' recognised.") con_bintype = "AND b.type = '%s'" % (Options["BinaryType"]) # REMOVE ME TRAMP if Options["BinaryType"] == "udeb": @@ -178,7 +178,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name suites.sort() for suite in suites: arches = d[pkg][version][suite] - arches.sort(daklib.utils.arch_compare_sw) + arches.sort(utils.arch_compare_sw) if Options["Format"] == "": #normal sys.stdout.write("%10s | %10s | %13s | " % (pkg, version, suite)) sys.stdout.write(", ".join(arches)) -- 2.39.5