From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 9 Jun 2008 16:01:55 +0000 (-0700)
Subject:  * Use IO::File and Debbugs::Config::config
X-Git-Tag: release/2.6.0~488^2~45
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c25bf7c32e8398e959e875566bceb01c50d4b248;p=debbugs.git

 * Use IO::File and Debbugs::Config::config
---

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 0bceb72..191b453 100644
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -12,11 +12,11 @@ package Debbugs::Packages;
 use warnings;
 use strict;
 
-use Debbugs::Config qw(:config :globals);
-
 use base qw(Exporter);
 use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS @EXPORT);
 
+use Debbugs::Config qw(:config :globals);
+
 BEGIN {
     $VERSION = 1.00;
 
@@ -39,6 +39,8 @@ use Debbugs::Common qw(make_list);
 
 use List::Util qw(min max);
 
+use IO::File;
+
 $MLDBM::DumpMeth = 'portable';
 $MLDBM::RemoveTaint = 1;
 
@@ -75,17 +77,17 @@ sub getpkgsrc {
     my %pkgcomponent;
     my %srcpkg;
 
-    open(MM,"$Debbugs::Packages::gPackageSource")
-	or die("open $Debbugs::Packages::gPackageSource: $!");
-    while(<MM>) {
+    my $fh = IO::File->new($config{package_source},'r')
+	or die("Unable to open $config{package_source} for reading: $!");
+    while(<$fh>) {
 	next unless m/^(\S+)\s+(\S+)\s+(\S.*\S)\s*$/;
 	my ($bin,$cmp,$src)=($1,$2,$3);
-	$bin =~ y/A-Z/a-z/;
+	$bin = lc($bin);
 	$pkgsrc{$bin}= $src;
 	push @{$srcpkg{$src}}, $bin;
 	$pkgcomponent{$bin}= $cmp;
     }
-    close(MM);
+    close($fh);
     $_pkgsrc = \%pkgsrc;
     $_pkgcomponent = \%pkgcomponent;
     $_srcpkg = \%srcpkg;