X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=95b36b1f1f7dfa840eaefa0bd2a8128ad02e4075;hb=907deca03b25dc8ce65c89062ff3d7ca7a358976;hp=4dba71f07fdae2501051d261d583ec2703895297;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 4dba71f0..95b36b1f 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -2,8 +2,7 @@
 
 # Create all the Release files
 
-# Copyright (C) 2001, 2002  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.27 2005-11-15 09:50:32 ajt Exp $
+# Copyright (C) 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,8 +23,8 @@
 ################################################################################
 
 import sys, os, popen2, tempfile, stat, time
-import utils
 import apt_pkg
+import daklib.utils
 
 ################################################################################
 
@@ -37,7 +36,7 @@ AptCnf = None
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: ziyi [OPTION]... [SUITE]...
+    print """Usage: dak generate-releases [OPTION]... [SUITE]...
 Generate Release files (for SUITE).
 
   -h, --help                 show this help and exit
@@ -105,13 +104,13 @@ 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)
 	    file_handle.close()
-	    out.write(" %s         %8d %s\n" % (hash, size, name))
+	    out.write(" %s %8d %s\n" % (hash, size, name))
 
 def print_md5_files (tree, files):
     print_md5sha_files (tree, files, apt_pkg.md5sum)
@@ -125,21 +124,21 @@ def main ():
     global Cnf, AptCnf, projectB, out
     out = sys.stdout
 
-    Cnf = utils.get_conf()
+    Cnf = daklib.utils.get_conf()
 
-    Arguments = [('h',"help","Ziyi::Options::Help")]
+    Arguments = [('h',"help","Generate-Releases::Options::Help")]
     for i in [ "help" ]:
-	if not Cnf.has_key("Ziyi::Options::%s" % (i)):
-	    Cnf["Ziyi::Options::%s" % (i)] = ""
+	if not Cnf.has_key("Generate-Releases::Options::%s" % (i)):
+	    Cnf["Generate-Releases::Options::%s" % (i)] = ""
 
     suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    Options = Cnf.SubTree("Ziyi::Options")
+    Options = Cnf.SubTree("Generate-Releases::Options")
 
     if Options["Help"]:
 	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()
@@ -182,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
 
@@ -199,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)))
 
@@ -238,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 != "":