Include '.postN' in generated egg's version so that version pinning with 'N.N.N.postN' works.

CHANGES.SlapOS.txt

+1.7.1.post8
+-----------
+
+- Include '.postN' in generated egg's version so that version pinning with 'N.N.N.postN' works.
+
 1.7.1.post7
 -----------
 

setup.py

@@ -12,7 +12,7 @@
 #
 ##############################################################################
 name = "zc.buildout"
-version = "1.7.1.post7"
+version = "1.7.1.post8"
 
 import os
 from setuptools import setup

src/zc/buildout/easy_install.py

@@ -1082,9 +1082,8 @@ class Installer:
             ws = working_set
 
         for requirement in requirements:
-            if patch_dict and requirement.project_name in patch_dict:
-                self._env.scan(
-                    self.build(str(requirement), {}, patch_dict=patch_dict))
+            self._env.scan(
+                self.build(str(requirement), {}, patch_dict=patch_dict))
             for dist in self._get_dist(requirement, ws, self._always_unzip):
                 ws.add(dist)
                 self._maybe_add_setuptools(ws, dist)
@@ -1189,11 +1188,16 @@ class Installer:
                     base = os.path.dirname(setups[0])
 
                 setup_cfg_dict = {'build_ext':build_ext}
+                parsed_version = dist.parsed_version
+                if parsed_version.is_postrelease and \
+                        dist.version.startswith(parsed_version.base_version):
+                    tag_build = dist.version[len(parsed_version.base_version):]
+                else:
+                    tag_build = ''
                 patch_dict = (patch_dict or {}).get(re.sub('[<>=].*', '', spec))
                 if patch_dict:
-                    setup_cfg_dict.update(
-                      {'egg_info':{'tag_build':'+%s%03d' % (PATCH_MARKER,
-                                                            patch_dict['patch_revision'])}})
+                    tag_build += '+%s%03d' % (PATCH_MARKER,
+                                              patch_dict['patch_revision'])
                     for patch in patch_dict['patches']:
                         url, md5sum = (patch.strip().split('#', 1) + [''])[:2]
                         download = zc.buildout.download.Download()
@@ -1207,6 +1211,8 @@ class Installer:
                         if popen.returncode != 0:
                             raise subprocess.CalledProcessError(
                                 popen.returncode, ' '.join(args))
+                setup_cfg_dict.update(
+                    {'egg_info':{'tag_build':tag_build}})
                 setup_cfg = os.path.join(base, 'setup.cfg')
                 if not os.path.exists(setup_cfg):
                     f = open(setup_cfg, 'w')