summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-08-24 00:32:30 +0000
committerPascal Terjan <pterjan@mageia.org>2012-08-24 00:32:30 +0000
commit8f4c6200dab19e1de9409d634b1f8cb519d16cb2 (patch)
treeee9ec4d8e11495a4cae7efd3cbac2b7942ec7b35
parentdbf770fb8adfa7c11fe9d58428dd4fce4c14c1b8 (diff)
downloadurpmi-8f4c6200dab19e1de9409d634b1f8cb519d16cb2.tar
urpmi-8f4c6200dab19e1de9409d634b1f8cb519d16cb2.tar.gz
urpmi-8f4c6200dab19e1de9409d634b1f8cb519d16cb2.tar.bz2
urpmi-8f4c6200dab19e1de9409d634b1f8cb519d16cb2.tar.xz
urpmi-8f4c6200dab19e1de9409d634b1f8cb519d16cb2.zip
Only search for README.urpmi files in doc files6.48.3
-rw-r--r--NEWS4
-rw-r--r--urpm.pm2
-rw-r--r--urpm/install.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 17898554..4649f650 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 6.48.3 - 24 August 2012
+
+- only search for README.urpmi files in doc files
+
Version 6.48.2 - 29 June 2012
- fix testsuite regressions
diff --git a/urpm.pm b/urpm.pm
index 2934a0f0..fa89a3ef 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -15,7 +15,7 @@ use urpm::md5sum;
# perl_checker: require urpm::media
# perl_checker: require urpm::parallel
-our $VERSION = '6.48.2';
+our $VERSION = '6.48.3';
our @ISA = qw(URPM Exporter);
our @EXPORT_OK = ('file_from_local_url', 'file_from_local_medium', 'is_local_medium');
diff --git a/urpm/install.pm b/urpm/install.pm
index 3dd97302..3220cb3e 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -107,7 +107,7 @@ sub install_logger {
sub get_README_files {
my ($urpm, $trans, $pkg) = @_;
- foreach my $file ($pkg->files) {
+ foreach my $file ($pkg->doc_files) {
my ($kind) = $file =~ m!/README([^/]*)\.urpmi$! or next;
my $valid;
if ($kind eq '') {