summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:25:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:25:29 +0000
commit6bd1ed902caf5beac68a83eef897f42767eb7562 (patch)
tree2403b06be8881b3a6285e5753ec1de1578f8699c
parent507b0901057e38083a1c7f630a95137dcc428331 (diff)
downloaddrakx-6bd1ed902caf5beac68a83eef897f42767eb7562.tar
drakx-6bd1ed902caf5beac68a83eef897f42767eb7562.tar.gz
drakx-6bd1ed902caf5beac68a83eef897f42767eb7562.tar.bz2
drakx-6bd1ed902caf5beac68a83eef897f42767eb7562.tar.xz
drakx-6bd1ed902caf5beac68a83eef897f42767eb7562.zip
(cat_) sync with MDK::Common (but keep older error message)
(perl_checker cleanups)
-rwxr-xr-xrescue/tree/sbin/fakeshutdown3
1 files changed, 2 insertions, 1 deletions
diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown
index cfc6df4dc..309f26c6c 100755
--- a/rescue/tree/sbin/fakeshutdown
+++ b/rescue/tree/sbin/fakeshutdown
@@ -13,7 +13,8 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-sub cat_ { local *F; open F, $_[0] or die "cat of file $_[0] failed: $!\n"; my @l = <F>; wantarray ? @l : join '', @l }
+# From MDK::Common:
+sub cat_ { open(my $F, '<', $_[0]) or die "cat of file $_[0] failed: $!\n"; my @l = <$F>; wantarray() ? @l : join '', @l }
print "\n";