diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-07-19 10:32:59 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-07-19 10:32:59 +0000 |
| commit | e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58 (patch) | |
| tree | 6105a784132400dda1aa41c7520006f9b5ac85a4 /perl-install | |
| parent | 65c4cf5a5db0dc5e8900256960960a54fdec0b69 (diff) | |
| download | drakx-e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58.tar drakx-e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58.tar.gz drakx-e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58.tar.bz2 drakx-e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58.tar.xz drakx-e87f4ab851d6f790b5c1e20b2bf1d3efe44b3e58.zip | |
rename ask_install_gtk in ask_install, ask_install is now
ask_install_simple (obsolete)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/services.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/services.pm b/perl-install/services.pm index fb488c1c5..7d24d389e 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -108,7 +108,7 @@ xfs => __("Starts the X Font Server (this is mandatory for XFree to run)."), $s; } -sub ask_install { +sub ask_install_simple { my ($in, $prefix) = @_; my ($l, $on_services) = services($prefix); $in->ask_many_from_list("drakxservices", @@ -121,7 +121,7 @@ sub ask_install { }); } -sub ask_install_gtk { +sub ask_install { my ($in, $prefix) = @_; my %root_services = ( _("Printing") => [ qw(cups lpr oki4daemon) ], @@ -237,10 +237,9 @@ sub ask_standalone_gtk { ($l, $on_services); } -sub ask { +sub ask { my ($in, $prefix) = @_; - return ref($in) !~ /gtk/ ? ask_install($in, $prefix) : - $::isInstall ? ask_install_gtk($in, $prefix) : ask_standalone_gtk($in, $prefix); + !$::isInstall && ref($in) =~ /gtk/ ? &ask_standalone_gtk : &ask_install; } sub doit { |