From 8026ff19e24847787bbfc5f876dc6a53e044a993 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Feb 2009 14:54:31 +0000 Subject: (get_updates_description) fix reading descriptions with --env= (needed for rpmdrake) --- NEWS | 1 + urpm.pm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0996f79d..9d8ec448 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ - drop support for /etc/urpmi/media.d/*.cfg (was partially broken, non documented and hopefully unused) +- fix reading descriptions with --env= - only load LDAP binding if needed (saves a couple MB in rpmdrake) Version 6.21 - 13 January 2009 diff --git a/urpm.pm b/urpm.pm index c2504bec..c06f24f4 100644 --- a/urpm.pm +++ b/urpm.pm @@ -412,7 +412,8 @@ sub get_updates_description { foreach my $medium (@update_medias) { # fix not taking into account the last %package token of each descrptions file: '%package dummy' - foreach (cat_utf8(urpm::media::statedir_descriptions($urpm, $medium)), '%package dummy') { + foreach (cat_utf8(urpm::media::statedir_descriptions($urpm, $medium)), + ($::env ? cat_utf8("$::env/descriptions") : ()), '%package dummy') { /^%package +(.+)/ and do { # fixes not parsing descriptions file when MU adds itself the security source: if (exists $cur->{importance} && !member($cur->{importance}, qw(security bugfix))) { -- cgit v1.2.1