diff options
author | Niels Thykier <niels@thykier.net> | 2016-05-01 07:23:01 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2016-05-01 07:43:21 +0000 |
commit | c5b14e3e54d7ca74744f55d48ed2a9d3ec9d0244 (patch) | |
tree | 01024190fb41c87cfedb2a1a120b920960cca8be | |
parent | 3787545641e4f6756b16deb9aa71c1f63e4cb85c (diff) | |
download | debhelper-c5b14e3e54d7ca74744f55d48ed2a9d3ec9d0244.tar.gz |
Prefer 3-arg open in Debhelper libraries
There are a few instances that have not been fixed yet.
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | Debian/Debhelper/Buildsystem/python_distutils.pm | 8 | ||||
-rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 38 |
2 files changed, 23 insertions, 23 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 0eef8f1e..21ac9d57 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -38,7 +38,7 @@ sub check_auto_buildable { sub not_our_cfg { my $this=shift; my $ret; - if (open(my $cfg, $this->get_buildpath(".pydistutils.cfg"))) { + if (open(my $cfg, '<', $this->get_buildpath(".pydistutils.cfg"))) { $ret = not "# Created by dh_auto\n" eq <$cfg>; close $cfg; } @@ -91,16 +91,16 @@ sub dbg_build_needed { # built in a clean chroot. my @dbg; - open (CONTROL, 'debian/control') || + open (my $fd, '<', 'debian/control') || error("cannot read debian/control: $!\n"); - foreach my $builddeps (join('', <CONTROL>) =~ + foreach my $builddeps (join('', <$fd>) =~ /^Build-Depends[^:]*:.*\n(?:^[^\w\n].*\n)*/gmi) { while ($builddeps =~ /(python[^, ]*-dbg)/g) { push @dbg, $1; } } - close CONTROL; + close($fd); return @dbg; } diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 1e4e0766..71cb9d7e 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -410,9 +410,9 @@ sub dirname { if (! defined $c) { $c=1; if (-e 'debian/compat') { - open (COMPAT_IN, "debian/compat") || error "debian/compat: $!"; - my $l=<COMPAT_IN>; - close COMPAT_IN; + open(my $compat_in, '<', "debian/compat") || error "debian/compat: $!"; + my $l=<$compat_in>; + close($compat_in); if (! defined $l || ! length $l) { error("debian/compat must contain a postive number (found an empty first line)"); @@ -629,11 +629,11 @@ sub autoscript_sed { my $infile = shift; my $outfile = shift; if (ref($sed) eq 'CODE') { - open(IN, $infile) or die "$infile: $!"; - open(OUT, ">>$outfile") or die "$outfile: $!"; - while (<IN>) { $sed->(); print OUT } - close(OUT) or die "$outfile: $!"; - close(IN) or die "$infile: $!"; + open(my $in, '<', $infile) or die "$infile: $!"; + open(my $out, '>>', $outfile) or die "$outfile: $!"; + while (<$in>) { $sed->(); print {$out} $_; } + close($out) or die "$outfile: $!"; + close($in) or die "$infile: $!"; } else { complex_doit("sed \"$sed\" $infile >> $outfile"); @@ -725,8 +725,8 @@ sub addsubstvar { my $line=""; if (-e $substvarfile) { my %items; - open(SUBSTVARS_IN, "$substvarfile") || error "read $substvarfile: $!"; - while (<SUBSTVARS_IN>) { + open(my $in, '<', $substvarfile) || error "read $substvarfile: $!"; + while (<$in>) { chomp; if (/^\Q$substvar\E=(.*)/) { %items = map { $_ => 1} split(", ", $1); @@ -734,7 +734,7 @@ sub addsubstvar { last; } } - close SUBSTVARS_IN; + close($in); if (! $remove) { $items{$str}=1; } @@ -775,7 +775,7 @@ sub filedoublearray { delete $ENV{"DH_CONFIG_ACT_ON_PACKAGES"}; } else { - open (DH_FARRAY_IN, $file) || error("cannot read $file: $!"); + open (DH_FARRAY_IN, '<', $file) || error("cannot read $file: $!"); } my @ret; @@ -888,18 +888,18 @@ sub is_cross_compiling { # Returns source package name sub sourcepackage { - open (CONTROL, 'debian/control') || + open (my $fd, '<', 'debian/control') || error("cannot read debian/control: $!\n"); - while (<CONTROL>) { + while (<$fd>) { chomp; s/\s+$//; if (/^Source:\s*(.*)/i) { - close CONTROL; + close($fd); return $1; } } - close CONTROL; + close($fd); error("could not find Source: line in control file."); } @@ -935,9 +935,9 @@ sub getpackages { if (exists $ENV{'DEB_BUILD_PROFILES'}) { @profiles=split /\s+/, $ENV{'DEB_BUILD_PROFILES'}; } - open (CONTROL, 'debian/control') || + open (my $fd, '<', 'debian/control') || error("cannot read debian/control: $!\n"); - while (<CONTROL>) { + while (<$fd>) { chomp; s/\s+$//; if (/^Package:\s*(.*)/i) { @@ -1006,7 +1006,7 @@ sub getpackages { $section=''; } } - close CONTROL; + close($fd); return @{$packages_by_type{$type}}; } |