X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=350573866f08a11645b1bb822f3da28346c46ae0;hb=9e5f0d9c81c0f0ea5fea6a40cce0ca388177f5cd;hp=b129a888a14a0560843d4879e89e6761d782f4c9;hpb=791e932971b92146d3621efdd29facc02b109774;p=dak.git

diff --git a/ziyi b/ziyi
index b129a888..35057386 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.15 2001-12-18 16:26:12 ajt Exp $
+# $Id: ziyi,v 1.17 2002-02-12 22:14:38 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
@@ -23,8 +23,8 @@
 
 ################################################################################
 
-import pg, sys, os, popen2, tempfile, stat, string, time
-import utils, db_access
+import sys, os, popen2, tempfile, stat, string, time
+import utils
 import apt_pkg
 
 ################################################################################
@@ -90,7 +90,7 @@ def print_md5sha_files (tree, files, hashop):
 		j = string.index(name, "/")
 		k = string.index(name, ">")
 		(cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:])
-		(size, file_handle) = create_temp_file("%s %s%s%s" % 
+		(size, file_handle) = create_temp_file("%s %s%s%s" %
 		    (cat, path, name, ext))
 	    else:
         	size = os.stat(path + name)[stat.ST_SIZE]
@@ -275,15 +275,26 @@ def main ():
 
 	out.close()
 	if Cnf.has_key("Dinstall::SigningKeyring"):
-	    dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg"
-	    if os.path.exists(dest):
-		os.unlink(dest)
 	    keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"]
 	    if Cnf.has_key("Dinstall::SigningPubKeyring"):
 		keyring = keyring + " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"]
 
-	    os.system("gpg %s --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (keyring,
-		Cnf["Dir::RootDir"] + tree + "/Release", dest))
+	    arguments = "--no-options --batch --no-tty --armour"
+	    if Cnf.has_key("Dinstall::SigningKeyIds"):
+		signkeyids = string.split(Cnf["Dinstall::SigningKeyIds"])
+	    else:
+		signkeyids = [""]
+
+	    dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg"
+	    if os.path.exists(dest):
+		os.unlink(dest)
+
+	    for keyid in signkeyids:
+		if keyid != "": defkeyid = "--default-key %s" % keyid
+		else: defkeyid = ""
+		os.system("gpg %s %s %s --detach-sign <%s >>%s" %
+			(keyring, defkeyid, arguments,
+			Cnf["Dir::RootDir"] + tree + "/Release", dest))
 
 #######################################################################################