Remove unused imports

diff --git a/charisma b/charisma
index c88fa52559633e588458cb6c343511300010ba1b..95f9998328cea4c9ad0864df7d30a86591dec954 100755 (executable)
--- a/charisma
+++ b/charisma
@@ -2,7 +2,7 @@
 
 # Generate Maintainers file used by e.g. the Debian Bug Tracking System
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: charisma,v 1.12 2001-11-18 19:57:58 rmurray Exp $
+# $Id: charisma,v 1.13 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
@@ -26,9 +26,9 @@
 
 ################################################################################
 
-import os, pg, re, string, sys
-import db_access, utils
-import apt_pkg
+import pg, string, sys;
+import db_access, utils;
+import apt_pkg;
 
 ################################################################################
 

diff --git a/heidi b/heidi
index a523b1692a54f082401154b2226d5b2cf872c237..7309da942ff9e76af23f536f14ef2cda63c79112 100755 (executable)
--- a/heidi
+++ b/heidi
@@ -2,7 +2,7 @@
 
 # Manipulate suite tags
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: heidi,v 1.11 2001-11-18 19:57:58 rmurray Exp $
+# $Id: heidi,v 1.12 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
@@ -42,7 +42,7 @@
 
 #######################################################################################
 
-import os, pg, string, sys;
+import pg, string, sys;
 import apt_pkg;
 import utils, db_access, logging;
 

diff --git a/julia b/julia
index a9e6173058862e6417ba44b94c7f65df32f9ada3..f6906f517f9bd43f52e8bd7da1a251f0bda85abd 100755 (executable)
--- a/julia
+++ b/julia
@@ -2,7 +2,7 @@
 
 # Sync PostgreSQL with (LDAP-generated) passwd file
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: julia,v 1.4 2001-11-18 19:57:58 rmurray Exp $
+# $Id: julia,v 1.5 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
@@ -30,7 +30,7 @@
 
 ################################################################################
 
-import os, pg, string, sys;
+import pg, string, sys;
 import utils;
 import apt_pkg;
 

diff --git a/madison b/madison
index 4df2924db881eb95ccbeb2345f8cf85e0be704f5..a81f5a12d79a711fc457f74487efadfb9f973196 100755 (executable)
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.14 2002-01-19 18:57:06 troup Exp $
+# $Id: madison,v 1.15 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
@@ -25,8 +25,8 @@
 
 ################################################################################
 
-import pg, sys, os, string
-import utils, db_access
+import pg, string, sys;
+import utils, db_access;
 import apt_pkg;
 
 ################################################################################

diff --git a/melanie b/melanie
index aa7bd05e9d3ff9be1836ec4728efb7a8ad1b0ef1..893b8ae75660eb07e854270986bc13a9cbe064f3 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose package removal tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.21 2002-01-28 18:53:01 troup Exp $
+# $Id: melanie,v 1.22 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
@@ -18,11 +18,29 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# X-Listening-To: Astronomy, Metallica - Garage Inc.
+################################################################################
+
+# o OpenBSD team wants to get changes incorporated into IPF. Darren no
+#    respond.
+# o Ask again -> No respond. Darren coder supreme.
+# o OpenBSD decide to make changes, but only in OpenBSD source
+#    tree. Darren hears, gets angry! Decides: "LICENSE NO ALLOW!"
+# o Insert Flame War.
+# o OpenBSD team decide to switch to different packet filter under BSD
+#    license. Because Project Goal: Every user should be able to make
+#    changes to source tree. IPF license bad!!
+# o Darren try get back: says, NetBSD, FreeBSD allowed! MUAHAHAHAH!!! 
+# o Theo say: no care, pf much better than ipf! 
+# o Darren changes mind: changes license. But OpenBSD will not change
+#    back to ipf. Darren even much more bitter.
+# o Darren so bitterbitter. Decides: I'LL GET BACK BY FORKING OPENBSD AND
+#    RELEASING MY OWN VERSION. HEHEHEHEHE.
+
+#                        http://slashdot.org/comments.pl?sid=26697&cid=2883271
 
 ################################################################################
 
-import commands, os, pg, pwd, re, string, sys, tempfile
+import commands, os, pg, re, string, sys, tempfile
 import utils, db_access
 import apt_pkg, apt_inst;
 
@@ -377,7 +395,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
         else:
             Subst["__BCC__"] = "X-Filler: 42";
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.21 $";
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.22 $";
         if carbon_copy:
             Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
         Subst["__SUITE_LIST__"] = suites_list;

diff --git a/natalie.py b/natalie.py
index d6420951e6a9f037524a1dbb70fd88ba8d80e09f..8fc1c0d9149885348c2ec3c4e1cb012f4b1db6e3 100755 (executable)
--- a/natalie.py
+++ b/natalie.py
@@ -2,7 +2,7 @@
 
 # Manipulate override files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: natalie.py,v 1.14 2001-11-19 22:19:46 rmurray Exp $
+# $Id: natalie.py,v 1.15 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
@@ -20,7 +20,7 @@
 
 ################################################################################
 
-import errno, os, pg, pwd, string, sys, time;
+import pg, string, sys, time;
 import utils, db_access, logging;
 import apt_pkg;
 

diff --git a/neve b/neve
index 4b9b624967b8f9a5c0e64aaad8809635fe77e9a0..d082420d3f015e60efbc36062491425718d1df9e 100755 (executable)
--- a/neve
+++ b/neve
@@ -2,7 +2,7 @@
 
 # Populate the DB
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: neve,v 1.7 2001-11-18 19:57:58 rmurray Exp $
+# $Id: neve,v 1.8 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
@@ -37,7 +37,7 @@
 
 ###############################################################################################################
 
-import commands, os, pg, re, sys, string, tempfile
+import commands, os, pg, re, string, tempfile
 import apt_pkg
 import db_access, utils
 

diff --git a/rhona b/rhona
index 7c5dbb29011b381d6b52ba8d1ff44b6144143327..9aa3215f5ed8a3b1a0a3f96b0c2ac636211af0a1 100755 (executable)
--- a/rhona
+++ b/rhona
@@ -2,7 +2,7 @@
 
 # rhona, cleans up unassociated binary and source packages
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: rhona,v 1.19 2001-11-24 18:42:10 troup Exp $
+# $Id: rhona,v 1.20 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
@@ -29,7 +29,7 @@
 
 ################################################################################
 
-import os, pg, stat, string, sys, time
+import os, pg, stat, sys, time
 import apt_pkg
 import utils
 

diff --git a/shania b/shania
index 66d8771c744301ac2a6af494b4de0cffa175ed50..5cd8ad7aeeade885a753fad3ecf7e1f1c8b61d7d 100755 (executable)
--- a/shania
+++ b/shania
@@ -2,7 +2,7 @@
 
 # Clean incoming of old unused files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: shania,v 1.11 2002-01-28 18:53:01 troup Exp $
+# $Id: shania,v 1.12 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
@@ -20,8 +20,8 @@
 
 ################################################################################
 
-import os, re, stat, string, sys, time, traceback
-import utils
+import os, stat, sys, time;
+import utils;
 import apt_pkg;
 
 ################################################################################
@@ -46,6 +46,7 @@ import apt_pkg;
 Cnf = None;
 Options = None;
 del_dir = None;
+delete_date = None;
 
 ################################################################################
 

diff --git a/ziyi b/ziyi
index 72c3f428d940b80945b7bbd325e2fe3a78d0265c..350573866f08a11645b1bb822f3da28346c46ae0 100755 (executable)
--- 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.16 2002-01-12 16:33:23 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]
@@ -292,7 +292,7 @@ def main ():
            for keyid in signkeyids:
                if keyid != "": defkeyid = "--default-key %s" % keyid
                else: defkeyid = ""
-               os.system("gpg %s %s %s --detach-sign <%s >>%s" % 
+               os.system("gpg %s %s %s --detach-sign <%s >>%s" %
                        (keyring, defkeyid, arguments,
                        Cnf["Dir::RootDir"] + tree + "/Release", dest))