diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-06-29 19:09:33 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-06-29 19:09:33 -0400 |
| commit | 2bf3d027f7cec6b231696a5621afd12aa36d7e38 (patch) | |
| tree | 6476e75fac4c947423f97aa16065df64098d23fe /backend | |
| parent | Tiny fix of URL structure to log viewer (diff) | |
| download | ingenue-2bf3d027f7cec6b231696a5621afd12aa36d7e38.tar.gz ingenue-2bf3d027f7cec6b231696a5621afd12aa36d7e38.tar.bz2 ingenue-2bf3d027f7cec6b231696a5621afd12aa36d7e38.zip | |
Fix small mistakes in build function
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/functions/build.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/functions/build.php b/backend/functions/build.php index 45a7415..1c4f457 100644 --- a/backend/functions/build.php +++ b/backend/functions/build.php @@ -35,7 +35,7 @@ function build(&$build) { 'PORTAGE_CONFIGROOT' => $C, 'PATH' => $_ENV['PATH'] ); - sql_task::execute_command('Log portage setup', 'emerge --info', $build, true, null, array_merge($env); + sql_task::execute_command('Log portage setup', 'emerge --info', $build, true, null, $env); // sql_task::execute_command('Pre-installing baselayout', 'emerge baselayout', $build, true, null, array_merge($env, array('USE' => 'build'))); // TODO create make.conf, make.profile in target /etc sql_task::execute_command('Install base system', 'emerge system', $build, true, null, $env); @@ -60,7 +60,7 @@ function build(&$build) { rename($W.'/image.tar.gz', COMPLETED.'/build-'.$build->id.'.tar.gz') || throw_exception('rename failed'); } elseif ($imgtype == 'livecd') { sql_task::execute_command('Compress finished image to squashfs', "mksquashfs '$W/image' '$W/image.squashfs' -info ", $build, true, null, $env); - } else { + } elseif ($imgtype !== 'installcd') { throw_exception('invalid image type: '.$imgtype); } if ($imgtype == 'livecd' || $imgtype == 'installcd') { |