diff options
| author | James Davidson <james.davidson@vyatta.com> | 2012-09-24 13:00:59 -0700 |
|---|---|---|
| committer | James Davidson <james.davidson@vyatta.com> | 2012-09-24 13:00:59 -0700 |
| commit | d0a640ae240679701920cf1e6d95feebc0e65b85 (patch) | |
| tree | 17389c4c908fb694909659e3472446b56df13d31 | |
| parent | ee9cb06db58d8ec1e533e3ee33b65169a41c3dfd (diff) | |
| download | vyatta-cfg-d0a640ae240679701920cf1e6d95feebc0e65b85.tar.gz vyatta-cfg-d0a640ae240679701920cf1e6d95feebc0e65b85.zip | |
Fix get_terminal_size redefinition warning
Also squelch warnings from requiring features.ph (via ioctl.ph).
Fixes bug 8387
| -rwxr-xr-x | lib/Vyatta/Misc.pm | 1 | ||||
| -rw-r--r-- | lib/Vyatta/ioctl.pm | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm index f44dec5..fa3131c 100755 --- a/lib/Vyatta/Misc.pm +++ b/lib/Vyatta/Misc.pm @@ -21,7 +21,6 @@ package Vyatta::Misc; use strict; -use Vyatta::ioctl; require Exporter; diff --git a/lib/Vyatta/ioctl.pm b/lib/Vyatta/ioctl.pm index 8ed8b93..7c745c3 100644 --- a/lib/Vyatta/ioctl.pm +++ b/lib/Vyatta/ioctl.pm @@ -24,7 +24,10 @@ use warnings; use Socket; use Socket6; -require 'sys/ioctl.ph'; +{ + local $^W = 0; + require 'sys/ioctl.ph'; +} our @EXPORT = qw(get_terminal_size get_interface_flags); use base qw(Exporter); |