aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-06 09:01:59 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-06 09:01:59 +0000
commitbc5368712767c63bb261c1f8b9cca069651fc7c7 (patch)
tree5e445e0011e4e13fbe66e79361596ce338f9719a
parent5480a8a0464fa3232bf9b7c7b53dbccb143d5e9a (diff)
downloadrpmdrake-bc5368712767c63bb261c1f8b9cca069651fc7c7.tar
rpmdrake-bc5368712767c63bb261c1f8b9cca069651fc7c7.tar.gz
rpmdrake-bc5368712767c63bb261c1f8b9cca069651fc7c7.tar.bz2
rpmdrake-bc5368712767c63bb261c1f8b9cca069651fc7c7.tar.xz
rpmdrake-bc5368712767c63bb261c1f8b9cca069651fc7c7.zip
(post_extract) keep IDs of packages rather than their paths
(success_summary) look at _all_ config files and only those instead of manually matching file paths beginning with "^/etc" (mga#8310) also do not fork useless rpm processes (backported from trunk)
-rw-r--r--NEWS3
-rw-r--r--Rpmdrake/pkg.pm10
2 files changed, 8 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 8073c0d6..33164c60 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- look at _all_ config files and only those instead of manually
+ matching file paths beginning with "^/etc" (mga#8310)
+
Version 5.34.1 - 21 September 2012, Thierry Vignaud
- display package basenames when signature checking fails
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 9d273a06..2a4be887 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -809,7 +809,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
$transaction_progress_nb = 0;
$done += grep { !/\.src\.rpm$/ } values %$transaction_sources; #updates
$total = keys(%$transaction_sources_install) + keys %$transaction_sources;
- push @rpms_upgrade, grep { !/\.src\.rpm$/ } values %$transaction_sources;
+ push @rpms_upgrade, keys %$transaction_sources;
$done += grep { !/\.src\.rpm$/ } values %$transaction_sources_install; # installs
},
pre_removable => sub {
@@ -872,10 +872,10 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
}
my $id = statusbar_msg(N("Inspecting configuration files..."), 0);
my %pkg2rpmnew;
- foreach my $u (@rpms_upgrade) {
- $u =~ m|/([^/]+-[^-]+-[^-]+)\.[^\./]+\.rpm$|
- and $pkg2rpmnew{$1} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") }
- map { chomp_($_) } run_rpm("rpm -ql $1") ];
+ foreach my $id (@rpms_upgrade) {
+ my $pkg = $urpm->{depslist}[$id];
+ next if $pkg->arch eq 'src';
+ $pkg2rpmnew{$pkg->fullname} = [ grep { -r "$_.rpmnew" || -r "$_.rpmsave" } $pkg->conf_files ];
}
statusbar_msg_remove($id);
dialog_rpmnew(N("The installation is finished; everything was installed correctly.