From d5113273cf2cefd1db9942e4d743f455aa8f669a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 10 Jul 2007 20:57:27 +0000 Subject: * more work towards perlcritic compliance, fixed the low-hanging fruit for level 4 git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1234 95ad53e4-c205-0410-b2fa-d234c58c8868 --- bin/devel-tools/parseSusePatterns.pl | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'bin/devel-tools/parseSusePatterns.pl') diff --git a/bin/devel-tools/parseSusePatterns.pl b/bin/devel-tools/parseSusePatterns.pl index 8ccc13da..317a9c47 100755 --- a/bin/devel-tools/parseSusePatterns.pl +++ b/bin/devel-tools/parseSusePatterns.pl @@ -15,6 +15,7 @@ # SUSE-pattern-files (*.pat). # ----------------------------------------------------------------------------- use strict; +use warnings; my $abstract = q[ parseSusePatterns.pl @@ -61,13 +62,14 @@ sub parsePatternFile my $patternFile = shift; my $outmost = shift; - if (!open(PAT, "<$patternFile")) { + my $patFH; + if (!open($patFH, '<', $patternFile)) { return unless $outmost; die "unable to open $patternFile"; } undef $/; - my $content = ; - close(PAT); + my $content = <$patFH>; + close($patFH); $patternNames{$patternFile} = 1; if ($content =~ m[^\=Sum.de:\s*(.+?)\s*$]ms) { @@ -88,6 +90,7 @@ sub parsePatternFile if ($content =~ m[^\+Prc:\s*?$(.+?)^\-Prc:\s*?$]ms) { addPkgNames($1); } + return; } sub addSubPatterns @@ -96,7 +99,11 @@ sub addSubPatterns my @subPatterns = grep { length($_) > 0 } - map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ } + map { + my $pattern = $_; + $pattern =~ s[^\s*(.+?)\s*$][$1]; + $pattern; + } split "\n", $patternNames; foreach my $subPattern (@subPatterns) { @@ -105,6 +112,7 @@ sub addSubPatterns parsePatternFile($subPatternFile); } } + return; } sub addPkgNames @@ -113,15 +121,18 @@ sub addPkgNames my @pkgNames = grep { length($_) > 0 } - map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ } + map { + my $pkg = $_; + $pkg =~ s[^\s*(.+?)\s*$][$1]; + $pkg; + } split "\n", $pkgs; foreach my $pkgName (@pkgNames) { $packageNames{$pkgName} = 1; } + return; } -__END__ - =head1 NAME parseSusePatterns.pl - OpenSLX script to extract a package list from -- cgit v1.2.3-55-g7522