From: James Troup <james@nocrew.org>
Date: Tue, 12 Feb 2002 22:12:44 +0000 (+0000)
Subject: add usage functions, remove unused variables, remove unused options, remove unused... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=240185ce8d1003ad7a1a15817d1e0c2ee55675f3;p=dak.git

add usage functions, remove unused variables, remove unused options, remove unused imports.
---

diff --git a/halle b/halle
index 86d21ddf..01f05dd4 100755
--- a/halle
+++ b/halle
@@ -2,7 +2,7 @@
 
 # Remove obsolete .changes files from proposed-updates
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: halle,v 1.3 2001-11-18 19:57:58 rmurray Exp $
+# $Id: halle,v 1.4 2002-02-12 22:12:44 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
@@ -20,20 +20,32 @@
 
 ################################################################################
 
-import os, pg, re, sys, string
-import utils, db_access
-import apt_pkg, apt_inst;
+import os, pg, re, sys, string;
+import utils, db_access;
+import apt_pkg;
 
 ################################################################################
 
 Cnf = None;
 projectB = None;
+Options = None;
 pu = {};
 
 re_isdeb = re.compile (r"^(.+)_(.+?)_(.+?).deb$");
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: halle [OPTION] <CHANGES FILE | ADMIN FILE>[...]
+Remove obsolete changes files from proposed-updates.
+
+  -v, --verbose              be more verbose about what is being done
+  -h, --help                 show this help and exit
+
+Need either changes files or an admin.txt file with a '.joey' suffix."""
+    sys.exit(exit_code)
+
+################################################################################
 
 def check_changes (filename):
     try:
@@ -44,8 +56,6 @@ def check_changes (filename):
         return;
     num_files = len(files.keys());
     for file in files.keys():
-        re_isadeb = re.compile (r".*\.u?deb$");
-
         if utils.re_isadeb.match(file) != None:
             m = re_isdeb.match(file);
             pkg = m.group(1);
@@ -146,12 +156,9 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    Arguments = [('q',"quiet","Halle::Options::Quiet"),
-                 ('v',"verbose","Halle::Options::Verbose"),
-                 ('D',"debug","Halle::Options::Debug"),
-                 ('h',"help","Halle::Options::Help"),
-                 ('V',"version","Halle::Options::Version")];
-    for i in [ "quiet", "verbose", "help", "debug" ]:
+    Arguments = [('v',"verbose","Halle::Options::Verbose"),
+                 ('h',"help","Halle::Options::Help")];
+    for i in [ "verbose", "help" ]:
 	if not Cnf.has_key("Halle::Options::%s" % (i)):
 	    Cnf["Halle::Options::%s" % (i)] = "";
 
diff --git a/jeri b/jeri
index ea813541..f8b97c28 100755
--- a/jeri
+++ b/jeri
@@ -2,7 +2,7 @@
 
 # Dependency check proposed-updates
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.3 2001-11-18 19:57:58 rmurray Exp $
+# $Id: jeri,v 1.4 2002-02-12 22:12:44 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
@@ -38,12 +38,26 @@ import apt_pkg, apt_inst;
 
 Cnf = None;
 projectB = None;
+Options = None;
 stable = {};
 stable_virtual = {};
 architectures = None;
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: jeri [OPTION] <CHANGES FILE | DEB FILE | ADMIN FILE>[...]
+Remove obsolete changes files from proposed-updates.
+
+  -q, --quiet                be quieter about what is being done
+  -v, --verbose              be more verbose about what is being done
+  -h, --help                 show this help and exit
+
+Need either changes files, deb files or an admin.txt file with a '.joey' suffix."""
+    sys.exit(exit_code)
+
+################################################################################
+
 def pp_dep (deps):
     pp_deps = [];
     for atom in deps:
@@ -140,7 +154,7 @@ def check_package(filename, files):
         return 1;
     Depends = control.Find("Depends");
     Pre_Depends = control.Find("Pre-Depends");
-    Recommends = control.Find("Recommends");
+    #Recommends = control.Find("Recommends");
     pkg_arch = control.Find("Architecture");
     base_file = os.path.basename(filename);
     if pkg_arch == "all":
@@ -272,10 +286,8 @@ def main ():
 
     Arguments = [('q',"quiet","Jeri::Options::Quiet"),
                  ('v',"verbose","Jeri::Options::Verbose"),
-                 ('D',"debug","Jeri::Options::Debug"),
-                 ('h',"help","Jeri::Options::Help"),
-                 ('V',"version","Jeri::Options::Version")];
-    for i in [ "quiet", "verbose", "help", "debug" ]:
+                 ('h',"help","Jeri::Options::Help")];
+    for i in [ "quiet", "verbose", "help" ]:
 	if not Cnf.has_key("Jeri::Options::%s" % (i)):
 	    Cnf["Jeri::Options::%s" % (i)] = "";