From 48b22dca97fa8a84912a60bc835645e8fbbe1952 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 10 Jul 2014 09:25:57 +0200 Subject: Changed to is_root_capability_required atm to avoid redeclarations --- lib/AdminPanel/Privileges.pm | 4 ++-- lib/AdminPanel/Rpmdragora/init.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/AdminPanel') diff --git a/lib/AdminPanel/Privileges.pm b/lib/AdminPanel/Privileges.pm index d46217d..50033c7 100644 --- a/lib/AdminPanel/Privileges.pm +++ b/lib/AdminPanel/Privileges.pm @@ -25,7 +25,7 @@ require Exporter; use base qw(Exporter); use English qw(-no_match_vars); -our @EXPORT = qw(require_root_capability +our @EXPORT = qw(is_root_capability_required ask_for_authentication); my $wrappers = { "sudo" => "/usr/bin/sudo", @@ -35,7 +35,7 @@ my $wrappers = { "sudo" => "/usr/bin/sudo", my $wrapper = 0; -sub require_root_capability { +sub is_root_capability_required { return $EUID != 0; } diff --git a/lib/AdminPanel/Rpmdragora/init.pm b/lib/AdminPanel/Rpmdragora/init.pm index 9349894..00d07c4 100644 --- a/lib/AdminPanel/Rpmdragora/init.pm +++ b/lib/AdminPanel/Rpmdragora/init.pm @@ -149,7 +149,7 @@ if ($MODE eq 'remove') { $default_list_mode = 'all_updates'; } -$MODE eq 'update' || $rpmdragora_options{'run-as-root'} and AdminPanel::Privileges::require_root_capability(); +$MODE eq 'update' || $rpmdragora_options{'run-as-root'} and AdminPanel::Privileges::is_root_capability_required(); $::noborderWhenEmbedded = 1; require AdminPanel::rpmdragora; -- cgit v1.2.1