X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=9e9b5f0e42d786277c432846067cd7850e0de710;hb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;hp=b76ab69e81c348da15eb812a33f20a1e6a356b09;hpb=0ca9669a25a3199eb5d9b11cf6faf3736e65000c;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index b76ab69e..9e9b5f0e 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -24,7 +24,7 @@ import sys, os, popen2, tempfile, stat, time import apt_pkg -import dak.lib.utils as utils +import daklib.utils ################################################################################ @@ -104,8 +104,8 @@ def print_md5sha_files (tree, files, hashop): (cat, path, name, ext)) else: size = os.stat(path + name)[stat.ST_SIZE] - file_handle = utils.open_file(path + name) - except utils.cant_open_exc: + file_handle = daklib.utils.open_file(path + name) + except daklib.utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: hash = hashop(file_handle) @@ -124,7 +124,7 @@ def main (): global Cnf, AptCnf, projectB, out out = sys.stdout - Cnf = utils.get_conf() + Cnf = daklib.utils.get_conf() Arguments = [('h',"help","Generate-Releases::Options::Help")] for i in [ "help" ]: @@ -138,7 +138,7 @@ def main (): usage() AptCnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) + apt_pkg.ReadConfigFileISC(AptCnf,daklib.utils.which_apt_conf_file()) if not suites: suites = Cnf.SubTree("Suite").List() @@ -181,7 +181,7 @@ def main (): elif AptCnf.has_key("bindirectory::%s" % (tree)): pass else: - aptcnf_filename = os.path.basename(utils.which_apt_conf_file()) + aptcnf_filename = os.path.basename(daklib.utils.which_apt_conf_file()) print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue @@ -198,7 +198,7 @@ def main (): out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time())))) if notautomatic != "": out.write("NotAutomatic: %s\n" % (notautomatic)) - out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures"))))) + out.write("Architectures: %s\n" % (" ".join(filter(daklib.utils.real_arch, SuiteBlock.ValueList("Architectures"))))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -237,7 +237,7 @@ def main (): release = open(relpath, "w") #release = open(longsuite.replace("/","_") + "_" + arch + "_" + sec + "_Release", "w") except IOError: - utils.fubar("Couldn't write to " + relpath) + daklib.utils.fubar("Couldn't write to " + relpath) release.write("Archive: %s\n" % (suite)) if version != "":