From 54410dc53bd985c6a7a0eb4942004880eaed7c9d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 28 Aug 2002 19:50:35 +0000 Subject: - use $::prefix in any::get_secure_level() - fix any::get_secure_level() not using prefix when it should --- perl-install/any.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index 4e27cbaa4..cba30c7ee 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1128,11 +1128,9 @@ sub ask_window_manager_to_logout { } sub get_secure_level { - my ($prefix) = @_; - - cat_("/etc/profile") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.0 msec - cat_("/etc/profile.d/msec.sh") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.1 msec - ${{ getVarsFromSh("$prefix/etc/sysconfig/msec") }}{SECURE_LEVEL} || #- 8.2 msec + cat_("$::prefix/etc/profile") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.0 msec + cat_("$::prefix/etc/profile.d/msec.sh") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.1 msec + ${{ getVarsFromSh("$::prefix/etc/sysconfig/msec") }}{SECURE_LEVEL} || #- 8.2 msec $ENV{SECURE_LEVEL}; } -- cgit v1.2.1