summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEudyptula <eitan@mosenkis.net>2009-07-17 12:27:02 -0400
committerEudyptula <eitan@mosenkis.net>2009-07-17 12:27:02 -0400
commit0ffa58ac3b7688b4849d082abf0378b78f3cb618 (patch)
treec3db8303aea79953f9065a1532f2f3b916772751 /frontend/modules
parentAdded predefined package sets; separated gentoo-specific setup into gentoo_se... (diff)
downloadingenue-0ffa58ac3b7688b4849d082abf0378b78f3cb618.tar.gz
ingenue-0ffa58ac3b7688b4849d082abf0378b78f3cb618.tar.bz2
ingenue-0ffa58ac3b7688b4849d082abf0378b78f3cb618.zip
Fixed bugs and added new/popular builds to welcome page
Diffstat (limited to 'frontend/modules')
-rw-r--r--frontend/modules/gentoo/step3.php20
1 files changed, 11 insertions, 9 deletions
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