summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-20 17:02:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-20 17:02:40 +0000
commitf866f651d88c4937d6cec784664f03290cc7c210 (patch)
tree28a6bf3cd54c1543b58240b64c1bfa3a52715c20
parent5539871b9bfbc7562bc549fc56f99b3ea3c0ad55 (diff)
downloadurpmi-f866f651d88c4937d6cec784664f03290cc7c210.tar
urpmi-f866f651d88c4937d6cec784664f03290cc7c210.tar.gz
urpmi-f866f651d88c4937d6cec784664f03290cc7c210.tar.bz2
urpmi-f866f651d88c4937d6cec784664f03290cc7c210.tar.xz
urpmi-f866f651d88c4937d6cec784664f03290cc7c210.zip
- urpmi
o do not write useless "foo (obsoletes foo-xxx)" in installed-through-deps.list (#42167)
-rw-r--r--NEWS5
-rw-r--r--urpm/orphans.pm4
2 files changed, 7 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 23eb22fb..f6136942 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
-- urpmi, urpmq:
+- urpmi, urpmq
o do not display all substring matches on stderr, only a subset of them, and
suggest to use "-a" to use all matches (#38956)
+- urpmi
+ o do not write useless "foo (obsoletes foo-xxx)" in
+ installed-through-deps.list (#42167)
Version 6.4 - 14 August 2008, Thierry Vignaud
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index f68a680d..ce050319 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -101,7 +101,9 @@ sub _renamed_unrequested {
my ($new_fn) = keys %{$rejected->{$fn}{closure}};
my ($new_n) = $new_fn =~ $fullname2name_re;
- $l{$new_n} = "(obsoletes $fn)";
+ if ($new_n ne $n) {
+ $l{$new_n} = "(obsoletes $fn)";
+ }
}
%l;
}