X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=c48390e4f54d6dae3f8299212a39df2546c0d090;hb=f1da46727831e1d6bfbb611459fa398dcfcd0e91;hp=350573866f08a11645b1bb822f3da28346c46ae0;hpb=bce58243846a5683b77f586c7210723b47227a60;p=dak.git

diff --git a/ziyi b/ziyi
index 35057386..c48390e4 100755
--- a/ziyi
+++ b/ziyi
@@ -2,8 +2,8 @@
 
 # Create all the Release files
 
-# Copyright (C) 2001  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.17 2002-02-12 22:14:38 troup Exp $
+# Copyright (C) 2001, 2002  Anthony Towns <ajt@debian.org>
+# $Id: ziyi,v 1.21 2002-05-18 23:54:59 troup Exp $
 
 # 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
@@ -31,6 +31,8 @@ import apt_pkg
 
 Cnf = None
 projectB = None
+out = None
+AptCnf = None
 
 ################################################################################
 
@@ -83,7 +85,7 @@ def create_temp_file (cmd):
     return (size, f)
 
 def print_md5sha_files (tree, files, hashop):
-    path = Cnf["Dir::RootDir"] + tree + "/"
+    path = Cnf["Dir::Root"] + tree + "/"
     for name in files:
         try:
 	    if name[0] == "<":
@@ -157,19 +159,28 @@ def main ():
 	    notautomatic = ""
 
 	if SuiteBlock.has_key("Components"):
-	    components = SuiteBlock.SubTree("Components").List()
+	    components = SuiteBlock.ValueList("Components")
 	else:
 	    components = []
 
 	nonus = 1
-	if components != []:
+	if components:
 	    for c in components:
 	        if string.find(c, "non-US/") != 0:
 		    nonus = 0
 	else:
 	    nonus = 0
+
+	if not nonus and  string.find(codename, "/updates") > 0:
+	    security = 1
+	else:
+	    security = 0
+
 	if nonus:
 	    longsuite = suite + "/non-US"
+	elif security:
+	    suite = suite + "/updates"
+	    longsuite = suite
 	else:
 	    longsuite = suite
 
@@ -183,8 +194,8 @@ def main ():
 	    print "ALERT: suite %s not in apt.conf, nor untouchable!" % (suite)
 	    continue
 
-	print Cnf["Dir::RootDir"] + tree + "/Release"
-	out = open(Cnf["Dir::RootDir"] + tree + "/Release", "w")
+	print Cnf["Dir::Root"] + tree + "/Release"
+	out = open(Cnf["Dir::Root"] + tree + "/Release", "w")
 
 	out.write("Origin: %s\n" % (origin))
 	out.write("Label: %s\n" % (label))
@@ -196,8 +207,8 @@ 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" % (string.join(filter(real_arch, SuiteBlock.SubTree("Architectures").List()))))
-	if components != []:
+	out.write("Architectures: %s\n" % (string.join(filter(real_arch, SuiteBlock.ValueList("Architectures")))))
+	if components:
             out.write("Components: %s\n" % (string.join(components)))
 
 	out.write("Description: %s\n" % (SuiteBlock["Description"]))
@@ -212,7 +223,7 @@ def main ():
 			    files.append(file)
 		    else:
 			disks = "%s/disks-%s" % (sec, arch)
-			diskspath = Cnf["Dir::RootDir"]+tree+"/"+disks
+			diskspath = Cnf["Dir::Root"]+tree+"/"+disks
 			if os.path.exists(diskspath):
 			    for dir in os.listdir(diskspath):
 				if os.path.exists("%s/%s/md5sum.txt" % (diskspath, dir)):
@@ -225,7 +236,7 @@ def main ():
 			rel = "%s/%s/Release" % (sec, arch)
 		    else:
 			rel = "%s/binary-%s/Release" % (sec, arch)
-		    relpath = Cnf["Dir::RootDir"]+tree+"/"+rel
+		    relpath = Cnf["Dir::Root"]+tree+"/"+rel
 
 		    if os.path.exists(relpath):
 			try:
@@ -285,7 +296,7 @@ def main ():
 	    else:
 		signkeyids = [""]
 
-	    dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg"
+	    dest = Cnf["Dir::Root"] + tree + "/Release.gpg"
 	    if os.path.exists(dest):
 		os.unlink(dest)
 
@@ -294,7 +305,7 @@ def main ():
 		else: defkeyid = ""
 		os.system("gpg %s %s %s --detach-sign <%s >>%s" %
 			(keyring, defkeyid, arguments,
-			Cnf["Dir::RootDir"] + tree + "/Release", dest))
+			Cnf["Dir::Root"] + tree + "/Release", dest))
 
 #######################################################################################