Merge branch 'master' into suggested-improvements

Conflicts:
	slapos/recipe/build.py

CHANGES.txt

 Changes
 =======
 
-0.5 (unreleased)
+0.6 (unreleased)
 ----------------
 
  * No changes yet.
 
+0.5 (2011-09-06)
+----------------
+
+ * Download: Expose location too for compatiblity. [Łukasz Nowak]
+
 0.4 (2011-09-06)
 ----------------
 

setup.py

 from setuptools import setup, find_packages
 
-version = '0.5-dev'
+version = '0.6-dev'
 name = 'slapos.recipe.build'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/build.py

@@ -341,6 +341,8 @@ class Script:
         patch_options = shlex.split(patch_options)
       if patch_binary is None:
         patch_binary = 'patch'
+      else:
+        patch_binary = patch_binary.strip()
       kwargs = dict()
       if cwd is not None:
         kwargs['cwd'] = cwd
@@ -374,14 +376,14 @@ configure_command = self.options.get('configure-command')
 if configure_command is None or configure_command.lower() == 'None':
   configure_command = ["./configure", "--prefix=%(location)s"] + %(configure-options)r.split()
 else:
-  configure_command = configure_command.split(' ')
+  configure_command = configure_command.split()
 self.logger.info('Configuring with: %%r' %% ' '.join(configure_command))
 self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir)
 call(configure_command, cwd=workdir, env=env)
 make_command = [self.options.get('make-binary', "make")]
 make_options = self.options.get('make-options')
 if make_options is not None:
-  make_command.extend(make_options.split(' '))
+  make_command.extend(make_options.split())
 self.logger.info('Building with %%r' %% ' '.join(make_command))
 call(make_command, cwd=workdir, env=env)
 make_command.append('install')

slapos/recipe/download.py

@@ -44,6 +44,9 @@ class Recipe:
           self.name)
       self.destination = os.path.join(self.parts, self.options.get('filename',
         self.name))
+      # backward compatibility with other recipes -- expose location
+      options['location'] = os.path.join(self.buildout['buildout'][
+        'parts-directory'], self.name)
     options['target'] = self.destination
 
   def install(self):