X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=cd7033429cfef972396c5aa87529c58038d5a492;hb=5fc7cefdb9b600c729ca5a82fd5b3a828f4fd370;hp=731fea930b03503094b130155992323fa5ee5d76;hpb=10b08271e7209664dcebc83cbca7d1106c6bd394;p=dak.git

diff --git a/ziyi b/ziyi
index 731fea93..cd703342 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.6 2001-05-05 07:20:57 ajt Exp $
+# $Id: ziyi,v 1.8 2001-09-27 01:22:51 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
@@ -34,6 +34,16 @@ projectB = None
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: ziyi [OPTION]
+Generate Release files.
+
+  -h, --help                 show this help and exit"""
+
+    sys.exit(exit_code)
+
+################################################################################
+
 def compressnames (tree,type,file):
     compress = AptCnf.get("%s::%s::Compress" % (tree,type), AptCnf.get("Default::%s::Compress" % (type), ". gzip"))
     result = []
@@ -82,19 +92,22 @@ def main ():
 
 
     apt_pkg.init()
-    
+
     Cnf = apt_pkg.newConfiguration()
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file())
 
     AptCnf = apt_pkg.newConfiguration()
     apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
-    print "APT.CONF IS: " + utils.which_apt_conf_file()
 
-    Arguments = [('d',"debug","Ziyi::Options::Debug", "IntVal"),
-                 ('h',"help","Ziyi::Options::Help"),
-                 ('v',"version","Ziyi::Options::Version")]
+    Arguments = [('h',"help","Ziyi::Options::Help")];
+    for i in [ "help" ]:
+        Cnf["Ziyi::Options::%s" % (i)] = "";
 
     suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    Options = Cnf.SubTree("Ziyi::Options")
+
+    if Options["Help"]:
+	usage();
 
     if suites == []:
         suites = Cnf.SubTree("Suite").List()
@@ -231,7 +244,7 @@ def main ():
 	    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.system("gpg --secret-keyring \"%s\" --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (Cnf["Dinstall::SigningKeyring"],
 		Cnf["Dir::RootDir"] + tree + "/Release", dest))
 
 #######################################################################################