diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-24 12:36:01 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-24 12:36:01 +0000 |
| commit | 0fd5ed344a182b5158d336bda17583285c28114a (patch) | |
| tree | c8d2bf6f9a52ee3dee4b12d05a606c81eea6083c /perl-install | |
| parent | 74e908552333ce8d7ba840c80d85627a031e2716 (diff) | |
| download | drakx-0fd5ed344a182b5158d336bda17583285c28114a.tar drakx-0fd5ed344a182b5158d336bda17583285c28114a.tar.gz drakx-0fd5ed344a182b5158d336bda17583285c28114a.tar.bz2 drakx-0fd5ed344a182b5158d336bda17583285c28114a.tar.xz drakx-0fd5ed344a182b5158d336bda17583285c28114a.zip | |
- do not display any message when user screenshot when chrooted during install
of pkgs (#33752)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 78bafd41b..b486ce972 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- do not display any message when user screenshot when chrooted during install + of pkgs (#33752) +- don't add resume=xxx to bootloader configuration if there is noresume (#33953) - ignore /proc/partitions when "solaris" extended partition is present (#33866) - translate the pkg summary when mdv-rpm-summary info is available (for the "Details" mode when installing packages) diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 40e92ec99..9b9f3cb16 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -1248,7 +1248,7 @@ sub X_options_from_o { sub screenshot_dir__and_move() { my ($dir0, $dir1, $dir2) = ('/root', "$::prefix/root", '/tmp'); if (-e $dir0 && ! -e '/root/non-chrooted-marker.DrakX') { - $dir0; #- it occurs during pkgs install when we are chrooted + ($dir0, 'nowarn'); #- it occurs during pkgs install when we are chrooted } elsif (-e $dir1) { if (-e "$dir2/DrakX-screenshots") { cp_af("$dir2/DrakX-screenshots", $dir1); @@ -1260,19 +1260,22 @@ sub screenshot_dir__and_move() { } } +my $warned; sub take_screenshot { my ($in) = @_; - my $dir = screenshot_dir__and_move() . '/DrakX-screenshots'; - my $warn; + my ($base_dir, $nowarn) = screenshot_dir__and_move(); + my $dir = "$base_dir/DrakX-screenshots"; if (!-e $dir) { mkdir $dir or $in->ask_warn('', N("Can not make screenshots before partitioning")), return; - $warn = 1; } my $nb = 1; $nb++ while -e "$dir/$nb.png"; system("fb2png /dev/fb0 $dir/$nb.png 0"); - $in->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots")) if $warn; + if (!$warned && !$nowarn) { + $warned = 1; + $in->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots")); + } } sub copy_advertising { |