From f0f1a4c7c569a9a9419ff76934d6c205e05be30c Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 13 May 2013 13:42:01 +0000 Subject: Do not use urpm code to check the folder as this is run as unprivileged user (mga#6083) --- mgaapplet | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mgaapplet') diff --git a/mgaapplet b/mgaapplet index 1a7a9ef6..b639759c 100755 --- a/mgaapplet +++ b/mgaapplet @@ -399,9 +399,8 @@ sub confirm_upgrade() { Gtk2::FileChooserButton->new(N("Browse"), 'select-folder'), 'current-folder-changed' => sub { $temp_dir = $_[0]->get_current_folder; - my $ok = 1; - require urpm; - urpm::check_dir({ fatal => sub { $ok = 0 } }, $temp_dir); + stat($temp_dir)[4] + my $ok = -d $temp_dir && ! -l $temp_dir && (stat($temp_dir)[4] == 0); $ok or ask_warn(N("Error"), N("You must choose a directory owned by the super administrator!")); }); $browse->set_current_folder($download_dir); @@ -434,9 +433,7 @@ sub confirm_upgrade() { setVar('DO_NOT_ASK_FOR_DISTRO_UPGRADE', bool2text($warn_me)); $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} = bool2text($warn_me); if ($res) { - require urpm; - my $ok = 1; - urpm::check_dir({ fatal => sub { $ok = 0 } }, $temp_dir); + my $ok = -d $temp_dir && ! -l $temp_dir && (stat($temp_dir)[4] == 0); $ok or goto &confirm_upgrade; $download_dir = $temp_dir; really_confirm_upgrade(); -- cgit v1.2.1