From c7e45ff4790589298366bcd617f93e2999de4d09 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Tue, 22 Dec 1998 04:48:09 +0000
Subject: update_to_10b6 is moved to update

also remove bin/update_to_10b6 :-)
---
 bin/Makefile.in |  2 +-
 bin/update      | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/Makefile.in b/bin/Makefile.in
index f3cee616b..1bdad7879 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -44,7 +44,7 @@ SCRIPTSDIR= 	$(prefix)/bin
 SHELL=		/bin/sh
 
 SCRIPTS=	digest_arch mmsitepass newlist rmlist add_members \
-		subscribe_enmasse update_to_10b6 arch
+		subscribe_enmasse update arch
 
 # Modes for directories and executables created by the install
 # process.  Default to group-writable directories but
diff --git a/bin/update b/bin/update
index 5442bceb5..f0c33f960 100755
--- a/bin/update
+++ b/bin/update
@@ -167,8 +167,7 @@ def archive_path_fixer(unused_arg, dir, files):
             os.chmod(abs, 0664)
 
 def remove_old_sources(module):
-    src = "%s/Mailman/%s.py" % (Mailman.mm_cfg.PREFIX,
-                                module)
+    src = "%s/%s" % (Mailman.mm_cfg.PREFIX, module)
     pyc = src + "c"
     if os.path.exists(src):
         print "removing", src
@@ -176,7 +175,7 @@ def remove_old_sources(module):
             os.unlink(src)
         except os.error, rest:
             print "Warning: couldn't remove", src, "--", str(rest)
-    if os.path.exists(pyc):
+    if module[-3:] == '.py' and os.path.exists(pyc):
         try:
             os.unlink(pyc)
         except os.error, rest:
@@ -184,8 +183,10 @@ def remove_old_sources(module):
 
 
 if __name__ == '__main__':
-    for mod in ("Archiver", "HyperArch", "HyperDatabase", "pipermail",
-                'smtplib'):
+    for mod in ('Mailman/Archiver.py', 'Mailman/HyperArch.py',
+                'Mailman/HyperDatabase.py', 'Mailman/pipermail.py',
+                'Mailman/smtplib.py',
+                'bin/update_to_10b6'):
         remove_old_sources(mod)
     lists = list_names()
     if not lists:
-- 
cgit v1.2.3-70-g09d2