diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-02-09 14:54:31 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-02-09 14:54:31 +0000 |
| commit | 8026ff19e24847787bbfc5f876dc6a53e044a993 (patch) | |
| tree | 299d7114b55be525fdad127fd9848258a696faaf | |
| parent | 4b7eeb93d1210c0b241c74d87106a7c50dadd1d9 (diff) | |
| download | urpmi-8026ff19e24847787bbfc5f876dc6a53e044a993.tar urpmi-8026ff19e24847787bbfc5f876dc6a53e044a993.tar.gz urpmi-8026ff19e24847787bbfc5f876dc6a53e044a993.tar.bz2 urpmi-8026ff19e24847787bbfc5f876dc6a53e044a993.tar.xz urpmi-8026ff19e24847787bbfc5f876dc6a53e044a993.zip | |
(get_updates_description) fix reading descriptions with --env=
(needed for rpmdrake)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm.pm | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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 @@ -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))) { |