Do not use urpm code to check the folder as this is run as unprivileged user (mga#6083)

2 files changed, 4 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 23f4604f..e65553ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - ensure nonfree/tainted media is kept enabled on distro upgrade
+- do not use urpm code to check the folder as this is run as unprivileged user (mga#6083)
 
 Version 2.80 - 4 May 2013, Colin Guthrie
 
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();