Revert accidental commit about experimental work

slapos/recipe/build.py

@@ -382,7 +382,29 @@ class Cmmi(Script):
   Compatibility on parameter level"""
 
   script = """
-self._install()
+if self.options['url']:
+  url = self.download(self.options['url'], self.options.get('md5sum'))
+  extract_dir = self.extract(url)
+  workdir = guessworkdir(extract_dir)
+else:
+  workdir = self.options['path']
+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()
+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())
+self.logger.info('Building with %%r' %% ' '.join(make_command))
+call(make_command, cwd=workdir, env=env)
+make_command.append('install')
+self.logger.info('Installing with %%r' %% ' '.join(make_command))
+call(make_command + ['install'], cwd=workdir, env=env)
 """
 
   def __init__(self, buildout, name, options):
@@ -392,29 +414,4 @@ self._install()
     if options['url'] and options['path']:
         raise zc.buildout.UserError('You must use either "url" or "path", not both!')
     if not (options['url'] or options['path']):
-        raise zc.buildout.UserError('You must provide either "url" or "path".')
-
-  def _install(self):
-    if self.options['url']:
-      url = self.download(self.options['url'], self.options.get('md5sum'))
-      extract_dir = self.extract(url)
-      workdir = guessworkdir(extract_dir)
-    else:
-      workdir = self.options['path']
-    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()
-    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())
-    self.logger.info('Building with %%r' %% ' '.join(make_command))
-    call(make_command, cwd=workdir, env=env)
-    make_command.append('install')
-    self.logger.info('Installing with %%r' %% ' '.join(make_command))
-    call(make_command + ['install'], cwd=workdir, env=env)
\ No newline at end of file
+        raise zc.buildout.UserError('You must provide either "url" or "path".')
\ No newline at end of file