[Checkins] SVN: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py small refactoring: moved code calculating the build location closer together, set the option in one place only

[Thomas Lotze]

Log message for revision 119629:
  small refactoring: moved code calculating the build location closer together, set the option in one place only

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

-=-
Modified: zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py
===================================================================
--- zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py	2011-01-18 06:37:17 UTC (rev 119628)
+++ zc.recipe.cmmi/trunk/src/zc/recipe/cmmi/__init__.py	2011-01-18 06:45:40 UTC (rev 119629)
@@ -38,10 +38,6 @@
         directory = buildout['buildout']['directory']
         download_cache = buildout['buildout'].get('download-cache')
 
-        location = options.get(
-            'location', buildout['buildout']['parts-directory'])
-        options['location'] = os.path.join(location, name)
-
         self.url = self.options['url']
         extra_options = self.options.get('extra_options', '')
         # get rid of any newlines that may be in the options so they
@@ -83,8 +79,13 @@
                     directory, download_cache, 'cmmi', 'build')
                 self.shared = os.path.join(self.shared, self._state_hash())
 
-            options['location'] = self.shared
+            location = self.shared
+        else:
+            location = os.path.join(options.get(
+                    'location', buildout['buildout']['parts-directory']), name)
 
+        options['location'] = location
+
     def _state_hash(self):
         # hash of our configuration state, so that e.g. different
         # ./configure options will get a different build directory