From ed2fcde3323d29d60a970c862bfe927c7c1ff27b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 27 Jan 2003 12:35:17 +0000 Subject: (require_root_capability): having extracted it from interactive enable to further simplify it --- perl-install/common.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'perl-install/common.pm') diff --git a/perl-install/common.pm b/perl-install/common.pm index d605676a6..8fa267d46 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -248,13 +248,9 @@ sub require_root_capability { if ($ENV{DISPLAY} && system('/usr/X11R6/bin/xtest') == 0) { if (fuzzy_pidofs(qr/\bkwin\b/) > 0) { exec("kdesu", "-c", "$0 @ARGV") or die N("kdesu missing"); - } else { - exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing"); - } - } else { - exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing"); } + exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing"); # still not root ? die "you must be root to run this program" if $>; -- cgit v1.2.1