From: Ryan Murray <rmurray@debian.org>
Date: Tue, 27 Nov 2001 04:13:43 +0000 (+0000)
Subject: add SigningPubKeyring option
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9e874a052fa6d383f1a16821b1689127749e4a7e;p=dak.git

add SigningPubKeyring option
---

diff --git a/ziyi b/ziyi
index 4ce3956c..e29ff4de 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.11 2001-11-24 18:44:14 troup Exp $
+# $Id: ziyi,v 1.12 2001-11-27 04:13:43 rmurray 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
@@ -252,8 +252,12 @@ def main ():
 	if Cnf.has_key("Dinstall::SigningKeyring"):
 	    dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg"
 	    if os.path.exists(dest):
-		 os.unlink(dest)
-	    os.system("gpg --secret-keyring \"%s\" --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (Cnf["Dinstall::SigningKeyring"],
+		os.unlink(dest)
+	    keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"]
+	    if Cnf.has_key("Dinstall::SigningPubKeyring"):
+		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))
 
 #######################################################################################