From 0ffa58ac3b7688b4849d082abf0378b78f3cb618 Mon Sep 17 00:00:00 2001 From: Eudyptula Date: Fri, 17 Jul 2009 12:27:02 -0400 Subject: Fixed bugs and added new/popular builds to welcome page --- frontend/modules/gentoo/step3.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'frontend/modules') diff --git a/frontend/modules/gentoo/step3.php b/frontend/modules/gentoo/step3.php index 89e7ec3..a4f1b30 100644 --- a/frontend/modules/gentoo/step3.php +++ b/frontend/modules/gentoo/step3.php @@ -4,17 +4,19 @@ if (in_array('timezone', $opts)) $this->select('timezone', 'timezone', 'Timezone', get_timezones()); if (in_array('dev-manager', $opts)) $this->select('dev-manager', 'dev-manager', '/dev Manager', array('udev' => 'udev', 'static-dev' => 'Static /dev')); -$profile=new sql_gentoo_profile($opts['profile']); -foreach (explode(' ', $this->get_opt('pkgsets')) as $pkgset) { - $pkgset=new sql_gentoo_pkgset($pkgset); - $pkgs=array(); - foreach (explode("\n", $pkgset->packages) as $pkg) { - if ($obj=sql_gentoo_package::from_atom($pkg, $profile)) { - $array=$obj->to_array(); - $pkgs[$pkg]="$pkg: {$array['desc']}"; +$profile=new sql_gentoo_profile($this->get_opt('profile')); +if (strlen($pkgsets=$this->get_opt('pkgsets'))) { + foreach (explode(' ', $this->get_opt('pkgsets')) as $pkgset) { + $pkgset=new sql_gentoo_pkgset($pkgset); + $pkgs=array(); + foreach (explode("\n", $pkgset->packages) as $pkg) { + if ($obj=sql_gentoo_package::from_atom($pkg, $profile)) { + $array=$obj->to_array(); + $pkgs[$pkg]="$pkg: {$array['desc']}"; + } } + $this->checkbox_array('pkgset-'.$pkgset->id, 'pkgset-'.$pkgset->id, $pkgset->name, $pkgs); } - $this->checkbox_array('pkgset-'.$pkgset->id, 'pkgset-'.$pkgset->id, $pkgset->name, $pkgs); } // TODO This shouldn't be a step at all, it should be in wizard.php to choose between bundlers // TODO This shouldn't be part of configurations, except possibly a default value. It should be for builds -- cgit v1.2.3-65-gdbad