aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-02 20:18:07 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-02 20:18:07 +0000
commitfc0883f8935053cf3d57f84facef373c8fdbeed1 (patch)
tree977167a20f0e8bc86a8f1b72eb13e740eba0c9f5
parent9ebb676228dbd17be82c013fece37834614efcca (diff)
downloadrpmdrake-fc0883f8935053cf3d57f84facef373c8fdbeed1.tar
rpmdrake-fc0883f8935053cf3d57f84facef373c8fdbeed1.tar.gz
rpmdrake-fc0883f8935053cf3d57f84facef373c8fdbeed1.tar.bz2
rpmdrake-fc0883f8935053cf3d57f84facef373c8fdbeed1.tar.xz
rpmdrake-fc0883f8935053cf3d57f84facef373c8fdbeed1.zip
(perform_installation) readd back callback_close that was wrongly
killed along callback_open (which indeed was redondant with urpmi code) while adding support for transaction in r22950, thus displaying again README.urpmi* note that readme processing really is duplicated with what urpmi::install::install() does
-rwxr-xr-xRpmdrake/pkg.pm8
1 files changed, 8 insertions, 0 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 122af691..f1457f4c 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -684,6 +684,14 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
noscripts => $urpm->{options}{noscripts},
callback_inst => $callback_inst,
callback_trans => $callback_inst,
+ callback_close => sub {
+ my ($urpm, undef, $pkgid) = @_;
+ return unless defined $pkgid;
+ my $pkg = $urpm->{depslist}[$pkgid];
+ my $fullname = $pkg->fullname;
+ my $trtype = (any { /\Q$fullname/ } values %transaction_sources_install) ? 'install' : '(update|upgrade)';
+ for ($pkg->files) { /\bREADME(\.$trtype)?\.urpmi$/ and $Readmes{$_} = $fullname }
+ },
);
my @l = urpm::install::install($urpm,
$to_remove,