diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-08-15 21:28:13 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-08-15 21:28:13 -0400 |
| commit | 06fa8c53fef2e6cf06a34e51d265a720758aefc5 (patch) | |
| tree | 22e6c1aacd1ee2da7b1f370ce6b35a4494037a06 | |
| parent | Quick hack to move bundler selection out of Gentoo module and make it a build... (diff) | |
| download | ingenue-06fa8c53fef2e6cf06a34e51d265a720758aefc5.tar.gz ingenue-06fa8c53fef2e6cf06a34e51d265a720758aefc5.tar.bz2 ingenue-06fa8c53fef2e6cf06a34e51d265a720758aefc5.zip | |
Fix builds->bundle() to use bundle column, not look in buildopts for bundler
| -rw-r--r-- | shared/classes/build.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/shared/classes/build.php b/shared/classes/build.php index 2484bf0..357d971 100644 --- a/shared/classes/build.php +++ b/shared/classes/build.php @@ -203,11 +203,10 @@ class sql_build extends conf_build_common { global $S; try { $opts=$this->get_opts(); - $bundler=$opts['bundler']; - if (!is_readable(BACKEND."/bundlers/$bundler/bundle.php")) - throw_exception("No bundle script for bundler $bundler"); + if (!is_readable(BACKEND."/bundlers/$this->bundler/bundle.php")) + throw_exception("No bundle script for bundler $this->bundler"); $S['build_steps']=array(); - $file=require(BACKEND."/bundlers/$bundler/bundle.php"); + $file=require(BACKEND."/bundlers/$this->bundler/bundle.php"); switch($this->status) { case 'building': $this->status='bundling'; @@ -221,7 +220,7 @@ class sql_build extends conf_build_common { return $file; } while ($step < count($S['build_steps'])) { - require(BACKEND."/bundlers/$bundler/{$S['build_steps'][$step]}.php"); + require(BACKEND."/bundlers/$this->bundler/{$S['build_steps'][$step]}.php"); $step++; $this->build_step=$step; $this->write(); |