diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 17 | ||||
| -rw-r--r-- | Rpmdrake/init.pm | 25 | ||||
| -rwxr-xr-x | edit-urpm-sources.pl | 2 |
4 files changed, 2 insertions, 43 deletions
@@ -1,5 +1,6 @@ - all o be able to handle --expert + o do not display a splash text anymore - edit-urpm-sources: o by default do not enable to alter the 'update' flag (unless --expert is given) diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index c04eb2be..2e51c39a 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -37,7 +37,7 @@ use urpm::lock; use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(check_if_first_run run); +our @EXPORT = qw(run); use mygtk2 qw(gtknew gtkset); use ugtk2 qw(:all); @@ -1131,21 +1131,6 @@ sub mainwindow() { } -sub check_if_first_run() { - if (!member(basename($0), @$already_splashed)) { - interactive_msg('rpmdrake', - N("%s - -Is it ok to continue?", - N("Welcome to the Software Media Manager! - -This tool will help you configure the packages media you wish to use on -your computer. They will then be available to install new software package -or to perform updates.")), yesno => 1) or myexit -1; - push @$already_splashed, basename($0); - } -} - sub run() { local $ugtk2::wm_icon = "title-install"; my $lock; diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm index 7f79851d..4982c7f1 100644 --- a/Rpmdrake/init.pm +++ b/Rpmdrake/init.pm @@ -157,31 +157,6 @@ but you may still browse the existing database."), yesno => 1, text => { no => N sub init() { URPM::bind_rpm_textdomain_codeset(); push @$already_splashed, $MODE if $rpmdrake_options{'no-splash'}; - if (!$> && !member($MODE, @$already_splashed)) { - interactive_msg(N("Welcome"), - N("%s - -Is it ok to continue?", - $MODE eq 'remove' ? - N("Welcome to the software removal tool! - -This tool will help you choose which software you want to remove from -your computer.") - : $MODE eq 'update' ? - N("Welcome to %s! - -This tool will help you choose the updates you want to install on your -computer.", $rpmdrake::myname_update) - : - ($rpmdrake::branded ? N("Welcome to the software installation tool!") - : N("Welcome to the software installation tool! - -Your Mandriva Linux system comes with several thousands of software -packages on CDROM or DVD. This tool will help you choose which software -you want to install on your computer."))) - , yesno => 1) or myexit(-1); - push @$already_splashed, $MODE; - } if (!$> && !$offered_to_add_sources->[0]) { if (interactive_msg(N("Welcome"), join("\n\n", diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl index 9abc0f05..5ccc255f 100755 --- a/edit-urpm-sources.pl +++ b/edit-urpm-sources.pl @@ -35,8 +35,6 @@ require_root_capability(); readconf(); -check_if_first_run(); - run(); myexit 0; |