X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=b76ab69e81c348da15eb812a33f20a1e6a356b09;hb=7aaaad3135c9164390af5897925660842368660b;hp=6ca6d3d320c075c0e76761a2ec8d25dbfadfcc0b;hpb=65153ef97e5567c0fc85142b16294fe6bb68e0ae;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 6ca6d3d3..b76ab69e 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -23,8 +23,8 @@
 ################################################################################
 
 import sys, os, popen2, tempfile, stat, time
-import dak.lib.utils
 import apt_pkg
+import dak.lib.utils as 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 = dak.lib.utils.open_file(path + name)
-        except dak.lib.utils.cant_open_exc:
+       	        file_handle = utils.open_file(path + name)
+        except 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 = dak.lib.utils.get_conf()
+    Cnf = 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,dak.lib.utils.which_apt_conf_file())
+    apt_pkg.ReadConfigFileISC(AptCnf,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(dak.lib.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
 
@@ -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(dak.lib.utils.real_arch, SuiteBlock.ValueList("Architectures")))))
+	out.write("Architectures: %s\n" % (" ".join(filter(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:
-                        dak.lib.utils.fubar("Couldn't write to " + relpath)
+                        utils.fubar("Couldn't write to " + relpath)
 
                     release.write("Archive: %s\n" % (suite))
                     if version != "":