svn commit: r560691 - /httpd/mod_python/trunk/dist/win32_postinstall.py

[nl...@apache.org]

Author: nlehuen
Date: Sun Jul 29 01:44:42 2007
New Revision: 560691

URL: http://svn.apache.org/viewvc?view=rev&rev=560691
Log:
All this stuff about building an uninstall log is not required. The file_created() function takes care of uninstalling files at removal.

Modified:
    httpd/mod_python/trunk/dist/win32_postinstall.py

Modified: httpd/mod_python/trunk/dist/win32_postinstall.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/dist/win32_postinstall.py?view=diff&rev=560691&r1=560690&r2=560691
==============================================================================
--- httpd/mod_python/trunk/dist/win32_postinstall.py (original)
+++ httpd/mod_python/trunk/dist/win32_postinstall.py Sun Jul 29 01:44:42 2007
@@ -111,12 +111,8 @@
 
         # put mod_python.so there
         mod_python_so_path = os.path.join(apachedir, "modules", "mod_python.so")
-        mod_python_uninstall_log = os.path.join(distutils.sysconfig.get_python_lib(), 'mod_python_uninstall.log')
-        shutil.copy2(mp, mod_python_so_path)
-        f = file(mod_python_uninstall_log, 'wb')
-        f.write(mod_python_so_path)
-        f.close()
-        os.remove(mp)
+        shutil.move(mp, mod_python_so_path)
+        file_created(mod_python_so_path)
 
         print """Important Note for Windows users, PLEASE READ!!!
 
@@ -153,10 +149,3 @@
            http://www.modpython.org/live/current/doc-html/inst-testing.html
 
         """ % (mp, os.path.join(apachedir, "conf", "httpd.conf"))
-elif len(sys.argv) > 1 and sys.argv[1] == "-remove":
-    mod_python_uninstall_log = os.path.join(distutils.sysconfig.get_python_lib(), 'mod_python_uninstall.log')
-    f = file(mod_python_uninstall_log, 'rb')
-    mod_python_so_path = f.read()
-    f.close()
-    os.remove(mod_python_so_path)
-    os.remove(mod_python_uninstall_log)