sync with upstream rpm.org: "Make perl.{req,prov} warn about unreadable files"

(Ville Skyttä, 2010-02-25)

3 files changed, 11 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index f073d91..d8039ce 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,8 @@
   by glibc for five years now and can safely be assumed that there's no longer
   any need for it, reducing ~8K packages' dependency on it during next rebuild.
   (Per Oyvind, mdv)
-- perl.prov: sync with upstream rpm.org
+- perl.prov: sync with upstream rpm.org:
+  o make perl.{req,prov} warn about unreadable files
 - use upstream fonconfig.prov as we had exactly the same file
 
 Version 1.147-12 - 24 Jul 2012, by Colin
diff --git a/perl.prov b/perl.prov
index 8c0e890..db6d5b2 100755
--- a/perl.prov
+++ b/perl.prov
@@ -85,7 +85,11 @@ sub process_file {
 
   my ($file) = @_;
   
-  open(FILE, "<$file") || return;
+  if (!open(FILE, $file)) {
+    warn("$0: Warning: Could not open file '$file' for reading: $!\n");
+    return;
+  }
+
 
   my ($package, $version, $incomment, $inover) = ();
 
diff --git a/perl.req b/perl.req
index 3f85193..f69bbde 100755
--- a/perl.req
+++ b/perl.req
@@ -77,7 +77,10 @@ sub process_file {
   
   my ($file) = @_;
   
-  open(FILE, "<$file") || return;
+  if (!open(FILE, $file)) {
+    warn("$0: Warning: Could not open file '$file' for reading: $!\n");
+    return;
+  }
   
   while (<FILE>) {