Mageia Bugzilla – Attachment 3360 Details for
Bug 103
do not give choice (or disable) to install category, not present (on selected media)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
less ugly patch
103.diff (text/plain), 2.32 KB, created by
Thierry Vignaud
on 2013-01-13 16:12:17 CET
(
hide
)
Description:
less ugly patch
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2013-01-13 16:12:17 CET
Size:
2.32 KB
patch
obsolete
>Index: compssUsers.pl >=================================================================== >--- compssUsers.pl (revision 316943) >+++ compssUsers.pl (working copy) >@@ -1,6 +1,7 @@ > package tmp::compssUsers; > > use common; >+use install::pkgs; > > my $low_resources = detect_devices::has_low_resources(); > my $netbook_desktop = detect_devices::is_netbook_nettop(); >@@ -17,6 +18,7 @@ > N_("Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc"), > flags => [ qw(OFFICE SPELLCHECK PIM ARCHIVING ), if_(!$light_desktop, qw(PUBLISHING)) ], > default_selected => 1, >+ required => [ qw(libreoffice-writer abiword) ], > }, > if_(!$server, > { label => N_("Game station"), >@@ -109,14 +111,17 @@ > { label => N_("Web/FTP"), > descr => N_("Apache, Pro-ftpd"), > flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ], >+ required => [ qw(apache-mpm-prefork lftp mirrordir rsync) ], > }, > { label => N_("Mail"), > descr => N_("Postfix mail server"), > flags => [ qw(NETWORKING_MAIL_SERVER) ], >+ required => [ 'postfix' ], > }, > { label => N_("Database"), > descr => N_("PostgreSQL or MariaDB database server"), > flags => [ qw(DATABASES DATABASES_SERVER) ], >+ required => [ qw(postgresql9.1 postgresql9.2 mariadb) ], > }, > { label => N_("Firewall/Router"), > descr => N_("Internet gateway"), >@@ -135,11 +140,13 @@ > descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"), > flags => [ qw(KDE X ACCESSIBILITY THEMES) ], > default_selected => !$light_desktop, >+ required => [ 'task-kde4-minimal' ], > }, > { label => N_("GNOME Workstation"), > descr => N_("A graphical environment with user-friendly set of applications and desktop tools"), > flags => [ qw(GNOME X THEMES), if_(!$light_desktop, qw(ACCESSIBILITY)) ], > default_selected => $netbook_desktop, >+ required => [ 'task-gnome-minimal' ], > }, > { label => N_("LXDE Desktop"), > flags => [ qw(LXDE X ACCESSIBILITY) ], >@@ -203,7 +210,9 @@ > } > } > >-my $compssUsers = [ map { @$_ } values %$h ]; >+my $compssUsers = [ grep { >+ $_->{required} ? install::pkgs::packageByName($::o->{packages}, $_->{required}) : 1; >+} map { @$_ } values %$h ]; > > my $gtk_display_compssUsers = sub { > my ($entry) = @_;
Index: compssUsers.pl =================================================================== --- compssUsers.pl (revision 316943) +++ compssUsers.pl (working copy) @@ -1,6 +1,7 @@ package tmp::compssUsers; use common; +use install::pkgs; my $low_resources = detect_devices::has_low_resources(); my $netbook_desktop = detect_devices::is_netbook_nettop(); @@ -17,6 +18,7 @@ N_("Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc"), flags => [ qw(OFFICE SPELLCHECK PIM ARCHIVING ), if_(!$light_desktop, qw(PUBLISHING)) ], default_selected => 1, + required => [ qw(libreoffice-writer abiword) ], }, if_(!$server, { label => N_("Game station"), @@ -109,14 +111,17 @@ { label => N_("Web/FTP"), descr => N_("Apache, Pro-ftpd"), flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ], + required => [ qw(apache-mpm-prefork lftp mirrordir rsync) ], }, { label => N_("Mail"), descr => N_("Postfix mail server"), flags => [ qw(NETWORKING_MAIL_SERVER) ], + required => [ 'postfix' ], }, { label => N_("Database"), descr => N_("PostgreSQL or MariaDB database server"), flags => [ qw(DATABASES DATABASES_SERVER) ], + required => [ qw(postgresql9.1 postgresql9.2 mariadb) ], }, { label => N_("Firewall/Router"), descr => N_("Internet gateway"), @@ -135,11 +140,13 @@ descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"), flags => [ qw(KDE X ACCESSIBILITY THEMES) ], default_selected => !$light_desktop, + required => [ 'task-kde4-minimal' ], }, { label => N_("GNOME Workstation"), descr => N_("A graphical environment with user-friendly set of applications and desktop tools"), flags => [ qw(GNOME X THEMES), if_(!$light_desktop, qw(ACCESSIBILITY)) ], default_selected => $netbook_desktop, + required => [ 'task-gnome-minimal' ], }, { label => N_("LXDE Desktop"), flags => [ qw(LXDE X ACCESSIBILITY) ], @@ -203,7 +210,9 @@ } } -my $compssUsers = [ map { @$_ } values %$h ]; +my $compssUsers = [ grep { + $_->{required} ? install::pkgs::packageByName($::o->{packages}, $_->{required}) : 1; +} map { @$_ } values %$h ]; my $gtk_display_compssUsers = sub { my ($entry) = @_;
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 103
:
2911
|
3360
|
3369
|
3370