[Checkins] SVN: zc.recipe.cmmi/trunk/ merged bug fix for keeping track of reused shared builds from 1.2 branch

[Thomas Lotze]

Log message for revision 102705:
  merged bug fix for keeping track of reused shared builds from 1.2 branch

Changed:
  U   zc.recipe.cmmi/trunk/CHANGES.txt
  U   zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py
  U   zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt

-=-
Modified: zc.recipe.cmmi/trunk/CHANGES.txt
===================================================================
--- zc.recipe.cmmi/trunk/CHANGES.txt	2009-08-12 08:43:42 UTC (rev 102704)
+++ zc.recipe.cmmi/trunk/CHANGES.txt	2009-08-12 08:49:49 UTC (rev 102705)
@@ -14,6 +14,12 @@
   method that can be overridden in other recipes, to support packages
   whose installation process is slightly different.
 
+1.2.1 (2009-08-12)
+==================
+
+Bug fix: keep track of reused shared builds.
+
+
 1.2.0 (2009-05-18)
 ==================
 

Modified: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py
===================================================================
--- zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py	2009-08-12 08:43:42 UTC (rev 102704)
+++ zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py	2009-08-12 08:49:49 UTC (rev 102705)
@@ -104,7 +104,7 @@
         if self.shared:
             if os.path.isdir(self.shared):
                 logger.info('using existing shared build')
-                return ()
+                return self.shared
             else:
                 os.makedirs(self.shared)
 

Modified: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt
===================================================================
--- zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt	2009-08-12 08:43:42 UTC (rev 102704)
+++ zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/shared.txt	2009-08-12 08:49:49 UTC (rev 102705)
@@ -215,3 +215,28 @@
     echo installing foo
     installing foo
     <BLANKLINE>
+
+
+Regression: Keeping track of a reused shared build
+==================================================
+
+zc.recipe.cmmi 1.2 had a bug that manifested when reusing a shared build by a
+second buildout: The part wouldn't keep track of the shared build and thus
+wasn't able to restore it if it got deleted from the cache. Let's simulate the
+second buildout by removing .installed.cfg, then this is how it should work:
+
+    >>> remove('.installed.cfg')
+    >>> print system('bin/buildout')
+    Installing foo.
+    foo: using existing shared build
+
+    >>> rmdir(cache, 'cmmi', 'build')
+    >>> print system('bin/buildout')
+    Uninstalling foo.
+    Installing foo.
+    foo: Unpacking and configuring
+    configuring foo /cache/cmmi/build/...
+    echo building foo
+    building foo
+    echo installing foo
+    installing foo