From: James Troup <james@nocrew.org>
Date: Sat, 24 Nov 2001 18:44:14 +0000 (+0000)
Subject: source release files + handle lack of untouchable [ajt]
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=409cbed1859be9a9873bc7a4f71e2e26a3be27f3;p=dak.git

source release files + handle lack of untouchable [ajt]
---

diff --git a/ziyi b/ziyi
index 81db8cdb..4ce3956c 100755
--- a/ziyi
+++ b/ziyi
@@ -3,7 +3,7 @@
 # Create all the Release files
 
 # Copyright (C) 2001  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.10 2001-11-18 19:57:58 rmurray Exp $
+# $Id: ziyi,v 1.11 2001-11-24 18:44:14 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
@@ -151,6 +151,14 @@ def main ():
 
 	tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
 
+	if AptCnf.has_key("tree::%s" % (tree)):
+	    pass
+	elif AptCnf.has_key("bindirectory::%s" % (tree)):
+	    pass
+	else:
+	    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")
 
@@ -179,30 +187,6 @@ def main ():
 			for file in compressnames("tree::%s" % (tree), "Sources", "%s/%s/Sources" % (sec, arch)):
 			    files.append(file)
 		    else:
-			rel = "%s/binary-%s/Release" % (sec, arch)
-			relpath = Cnf["Dir::RootDir"]+tree+"/"+rel
-			if os.path.exists(relpath):
-			    try:
-				release = open(relpath, "w")
-				#release = open(string.replace(longsuite,"/","_") + "_" + arch + "_" + sec + "_Release", "w")
-			    except IOError:
-				print "Couldn't write to " + relpath
-			    else:
-				release.write("Archive: %s\n" % (suite))
-				if version != "":
-				    release.write("Version: %s\n" % (version))
-				if nonus:
-				    release.write("Component: non-US/%s\n" % (sec))
-				else:
-				    release.write("Component: %s\n" % (sec))
-				release.write("Origin: %s\n" % (origin))
-				release.write("Label: %s\n" % (label))
-				if notautomatic != "":
-				    release.write("NotAutomatic: %s\n" % (notautomatic))
-				release.write("Architecture: %s\n" % (arch))
-				release.close()
-			    files.append("%s/binary-%s/Release" % (sec,arch))
-
 			disks = "%s/disks-%s" % (sec, arch)
 			diskspath = Cnf["Dir::RootDir"]+tree+"/"+disks
 			if os.path.exists(diskspath):
@@ -213,6 +197,34 @@ def main ():
 			for file in compressnames("tree::%s" % (tree), "Packages", "%s/binary-%s/Packages" % (sec, arch)):
 			    files.append(file)
 
+		    if arch == "source":
+			rel = "%s/%s/Release" % (sec, arch)
+		    else:
+			rel = "%s/binary-%s/Release" % (sec, arch)
+		    relpath = Cnf["Dir::RootDir"]+tree+"/"+rel
+
+		    if os.path.exists(relpath):
+			try:
+			    release = open(relpath, "w")
+			    #release = open(string.replace(longsuite,"/","_") + "_" + arch + "_" + sec + "_Release", "w")
+			except IOError:
+			    print "Couldn't write to " + relpath
+			else:
+			    release.write("Archive: %s\n" % (suite))
+			    if version != "":
+				release.write("Version: %s\n" % (version))
+			    if nonus:
+				release.write("Component: non-US/%s\n" % (sec))
+			    else:
+				release.write("Component: %s\n" % (sec))
+			    release.write("Origin: %s\n" % (origin))
+			    release.write("Label: %s\n" % (label))
+			    if notautomatic != "":
+				release.write("NotAutomatic: %s\n" % (notautomatic))
+			    release.write("Architecture: %s\n" % (arch))
+			    release.close()
+			    files.append(rel)
+
 	    if AptCnf.has_key("tree::%s/main" % (tree)):
 	        sec = string.split(AptCnf["tree::%s/main::Sections" % (tree)])[0]
 		if sec != "debian-installer":