[dak/security] Use "import daklib.foo as foo" style
---
ChangeLog | 1 +
dak/generate_index_diffs.py | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
mode change 100644 => 100755 dak/generate_index_diffs.py
diff --git a/ChangeLog b/ChangeLog
index a45a7eb..ae2deb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
* dak/cruft_report.py: likewise
* dak/examine_package.py: likewise
* dak/find_null_maintainers.py: likewise
+ * dak/generate_index_diffs.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/generate_index_diffs.py b/dak/generate_index_diffs.py
old mode 100644
new mode 100755
index 03d5165..7cbedb9
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -32,7 +32,7 @@
import sys, os, tempfile
import apt_pkg
-import daklib.utils
+import daklib.utils as utils
################################################################################
@@ -286,7 +286,7 @@ def main():
os.umask(0002)
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"),
('c', None, "Generate-Index-Diffs::Options::CanonicalPath", "hasArg"),
('p', "patchname", "Generate-Index-Diffs::Options::PatchName", "hasArg"),
@@ -312,7 +312,7 @@ def main():
o.close()
AptCnf = apt_pkg.newConfiguration()
- apt_pkg.ReadConfigFileISC(AptCnf,daklib.utils.which_apt_conf_file())
+ apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"]
@@ -349,7 +349,7 @@ def main():
elif AptCnf.has_key("bindirectory::%s" % (tree)):
sections = AptCnf["bindirectory::%s::Sections" % (tree)].split()
else:
- aptcnf_filename = os.path.basename(daklib.utils.which_apt_conf_file())
+ aptcnf_filename = os.path.basename(utils.which_apt_conf_file())
print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
continue
--
1.5.6.5
Reply to: