Package: python-support
Version: 0.6.3
Severity: wishlist
Tags: patch

Hi,

as discussed on IRC, here's a patch removing the -py$(VERSION) part of
the egg directories, so that they are handled correctly afterwards.

Cheers,

-- 
Cyril Brulebois
--- pysupport-movemodules~      2007-03-21 22:16:14.000000000 +0100
+++ pysupport-movemodules       2007-05-06 00:53:04.000000000 +0200
@@ -85,6 +85,21 @@
         destdir=os.path.join(extensionpath,package,pyver)
       os.renames(sourcefile,os.path.join(basedir,destdir,relfile))
 
+# Remove the -py$(VERSION) part of the egg directories
+def do_eggrename (basedir, package, pybasedir, suffixdir=""):
+  file_dict=filelist()
+  for pyvers in py_supported:
+    pydir=os.path.join(basedir,pybasedir,pyvers,suffixdir)
+    if not os.path.isdir(pydir):
+      continue
+    for item in os.listdir(pydir):
+      item=os.path.join(pydir,item)
+      if not os.path.isdir(item):
+        continue
+      if item.endswith("-py"+pyvers+".egg-info"):
+       new_item = item.replace("-py"+pyvers+".egg-info",".egg-info")
+       os.rename(item, new_item)
+
 for basedir in args:
   basedir=basedir.rstrip('/')
   package=options.package
@@ -92,6 +107,7 @@
     package=os.path.split(basedir)[1]
   if not package:
     raise "Unable to extract the package name."
+  do_eggrename (basedir, package, "usr/lib", "site-packages")
   do_move (basedir, package, "usr/lib", "site-packages")
   do_move (basedir, package, "var/lib/python-support")
 

Reply via email to