X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=d6b3782debd51f499d407565f0f5bc7b6f326014;hb=7f7fd010ed3038e7ad4cd5dd80610a9034044f8c;hp=1edcf7dcf9d53bcfadd8f04e950a1133e8064328;hpb=c846e77a848d60dd115f00faa0d9a854161d99eb;p=dak.git

diff --git a/ziyi b/ziyi
index 1edcf7dc..d6b3782d 100755
--- a/ziyi
+++ b/ziyi
@@ -3,7 +3,7 @@
 # Create all the Release files
 
 # Copyright (C) 2001, 2002  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.23 2002-10-16 02:47:32 troup Exp $
+# $Id: ziyi,v 1.25 2003-01-02 18:14:28 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
@@ -37,10 +37,12 @@ AptCnf = None
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: ziyi [OPTION]
-Generate Release files.
+    print """Usage: ziyi [OPTION]... [SUITE]...
+Generate Release files (for SUITE).
 
-  -h, --help                 show this help and exit"""
+  -h, --help                 show this help and exit
+
+If no SUITE is given Release files are generated for all suites."""
 
     sys.exit(exit_code)
 
@@ -118,9 +120,6 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
-
     Arguments = [('h',"help","Ziyi::Options::Help")];
     for i in [ "help" ]:
 	if not Cnf.has_key("Ziyi::Options::%s" % (i)):
@@ -132,6 +131,9 @@ def main ():
     if Options["Help"]:
 	usage();
 
+    AptCnf = apt_pkg.newConfiguration()
+    apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
+
     if not suites:
         suites = Cnf.SubTree("Suite").List()
 
@@ -173,7 +175,8 @@ def main ():
 	elif AptCnf.has_key("bindirectory::%s" % (tree)):
 	    pass
 	else:
-	    print "ALERT: suite %s not in apt.conf, nor untouchable!" % (suite)
+            aptcnf_filename = os.path.basename(utils.which_apt_conf_file());
+	    print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename);
 	    continue
 
 	print Cnf["Dir::Root"] + tree + "/Release"