public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: zc_buildout_nix, replace links to eggs in the store which have been gc-ed

Browse Source
This commit is contained in:
Cillian de Róiste 2013-10-08 01:51:24 +02:00
parent fd05af8bc0
commit bfac9f828e
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/python-modules/buildout-nix/nix.patch
View File

@ -1,21 +1,36 @@
--- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200 --- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200
+++ b/src/zc/buildout/easy_install.py 2013-08-27 22:31:07.967871186 +0200 +++ b/src/zc/buildout/easy_install.py 2013-10-07 00:29:31.077413935 +0200
@@ -508,16 +508,15 @@ @@ -508,16 +508,31 @@
self._dest, os.path.basename(dist.location)) self._dest, os.path.basename(dist.location))
if os.path.isdir(dist.location): if os.path.isdir(dist.location):
- # we got a directory. It must have been - # we got a directory. It must have been
- # obtained locally. Just copy it. - # obtained locally. Just copy it.
- shutil.copytree(dist.location, newloc) - shutil.copytree(dist.location, newloc)
+ # Symlink to dists in /nix/store + # Replace links to garbage collected eggs in
+ if not os.path.exists(newloc): + # /nix/store
+ if os.path.islink(newloc):
+ # It seems necessary to jump through these
+ # hoops, otherwise we end up in an
+ # infinite loop because
+ # self._env.best_match fails to find the dist
+ os.remove(newloc)
+ dist = self._fetch(avail, tmp, self._download_cache)
+ os.symlink(dist.location, newloc) + os.symlink(dist.location, newloc)
+ newdist = pkg_resources.Distribution.from_filename(
+ newloc)
+ self._env.add(newdist)
+ logger.info("Updated link to %s" %dist.location)
+ # Symlink to the egg in /nix/store
+ elif not os.path.exists(newloc):
+ os.symlink(dist.location, newloc)
+ logger.info("Created link to %s" %dist.location)
else: else:
setuptools.archive_util.unpack_archive( setuptools.archive_util.unpack_archive(
dist.location, newloc) dist.location, newloc)
-
- redo_pyc(newloc) - redo_pyc(newloc)
+ redo_pyc(newloc) + redo_pyc(newloc)