diff options
| author | Angelo Naselli <anaselli@linux.it> | 2015-04-20 17:07:58 +0200 |
|---|---|---|
| committer | Angelo Naselli <anaselli@linux.it> | 2015-04-20 17:07:58 +0200 |
| commit | 501daacf8353872342fc7085b9860ced045965a8 (patch) | |
| tree | 05ce8af1f418a58ca06efa055001dce080d7a5a8 | |
| parent | cc965a54e36161a8284afe2e4d1afff8ae56fc72 (diff) | |
| download | manatools-501daacf8353872342fc7085b9860ced045965a8.tar manatools-501daacf8353872342fc7085b9860ced045965a8.tar.gz manatools-501daacf8353872342fc7085b9860ced045965a8.tar.bz2 manatools-501daacf8353872342fc7085b9860ced045965a8.tar.xz manatools-501daacf8353872342fc7085b9860ced045965a8.zip | |
Fixed dtring to be printed/shown during installationv1.0.1
| -rw-r--r-- | lib/ManaTools/Rpmdragora/pkg.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/ManaTools/Rpmdragora/pkg.pm b/lib/ManaTools/Rpmdragora/pkg.pm index 503c2bcb..6d83bded 100644 --- a/lib/ManaTools/Rpmdragora/pkg.pm +++ b/lib/ManaTools/Rpmdragora/pkg.pm @@ -839,19 +839,20 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my ($progress, $total, @rpms_upgrade); my $transaction; - my ($progress_nb, $transaction_progress_nb, $remaining, $done); + my ($progress_nb, $transaction_progress_nb, $remaining, $done) = (0, 0, 0 ,0); my $callback_inst = sub { my ($urpm, $type, $id, $subtype, $amount, $total) = @_; my $pkg = defined $id ? $urpm->{depslist}[$id] : undef; if ($subtype eq 'start') { if ($type eq 'trans') { - print(1 ? $loc->N("Preparing package installation...") : $loc->N("Preparing package installation transaction...")); + print($loc->N("Preparing package installation...") . "\n"); $gurpm->label($loc->N("Preparing package installation...")); } elsif (defined $pkg) { $something_installed = 1; - print($loc->N("Installing package `%s' (%s/%s)...", $pkg->name, $transaction_progress_nb, scalar(@{$transaction->{upgrade}}))."\n" . $loc->N("Total: %s/%s", $progress_nb, $install_count)); - $gurpm->label($loc->N("Installing package `%s' (%s/%s)...", $pkg->name, ++$transaction_progress_nb, scalar(@{$transaction->{upgrade}})) - . "\n" . $loc->N("Total: %s/%s", ++$progress_nb, $install_count)); + $gurpm->label($loc->N("Installing package `%s' (%d/%d)...", $pkg->name, ++$transaction_progress_nb, scalar(@{$transaction->{upgrade}})) + . "\n" . $loc->N("Total: %d/%d", ++$progress_nb, $install_count)); + print($loc->N("Installing package `%s' (%d/%d)...", $pkg->name, $transaction_progress_nb, scalar(@{$transaction->{upgrade}})) . + "\n" . $loc->N("Total: %d/%d", $progress_nb, $install_count) . "\n"); } } elsif ($subtype eq 'progress') { $gurpm->progress($total ? ceil(($amount/$total)*100) : 100); |