diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-03-16 11:28:50 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-03-16 11:28:50 +0000 |
| commit | 9582d634dfa055bdf532d74d9031dbee0e92b963 (patch) | |
| tree | 8df82f90dcbba779672cce0402a26a645dad58b4 | |
| parent | 92339c6012e71730a500797246f9f84801db1c62 (diff) | |
| download | rpmdrake-9582d634dfa055bdf532d74d9031dbee0e92b963.tar rpmdrake-9582d634dfa055bdf532d74d9031dbee0e92b963.tar.gz rpmdrake-9582d634dfa055bdf532d74d9031dbee0e92b963.tar.bz2 rpmdrake-9582d634dfa055bdf532d74d9031dbee0e92b963.tar.xz rpmdrake-9582d634dfa055bdf532d74d9031dbee0e92b963.zip | |
(perform_installation) display global count as well as transaction count (#XXXX)
| -rwxr-xr-x | Rpmdrake/pkg.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 1fb02f04..f5fe76b9 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -533,7 +533,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( split_length => $urpm->{options}{'split-length'} || 1, ); - my $progress_nb; + my ($progress_nb, $transaction_progress_nb); my ($nok, @rpms_install, @rpms_upgrade, $verbose); my $transaction; @@ -545,7 +545,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( Rpmdrake::gurpm::label(@rpms_install ? N("Preparing packages installation...") : N("Preparing...")); } elsif (defined $pkg) { $something_installed = 1; - Rpmdrake::gurpm::label(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$progress_nb, scalar(@{$transaction->{upgrade}}))); + Rpmdrake::gurpm::label(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$transaction_progress_nb, scalar(@{$transaction->{upgrade}})) + . "\n" .N("Total: %s/%s", ++$progress_nb, $install_count)); } } elsif ($subtype eq 'progress') { Rpmdrake::gurpm::progress($total ? $amount/$total : 1); @@ -555,7 +556,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( foreach my $set (@{$state->{transaction} || []}) { my (@transaction_list, %transaction_sources); $transaction = $set; - $progress_nb = 0; + $transaction_progress_nb = 0; #- prepare transaction... urpm::install::prepare_transaction($urpm, $set, $list, \%sources, \@transaction_list, \%transaction_sources); #- first, filter out what is really needed to download for this small transaction. |