summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-04-28 18:25:21 +0000
committerColin Guthrie <colin@mageia.org>2013-04-28 18:25:21 +0000
commitf4416168ecb5744bc0683a5ed49b5ca02c4014d4 (patch)
tree86b4b715267c2725c9a92f12b3fc254ebb96e03c
parent5573c393830262d43ce1be7496bbf364cba9e148 (diff)
downloadmgaonline-f4416168ecb5744bc0683a5ed49b5ca02c4014d4.tar
mgaonline-f4416168ecb5744bc0683a5ed49b5ca02c4014d4.tar.gz
mgaonline-f4416168ecb5744bc0683a5ed49b5ca02c4014d4.tar.bz2
mgaonline-f4416168ecb5744bc0683a5ed49b5ca02c4014d4.tar.xz
mgaonline-f4416168ecb5744bc0683a5ed49b5ca02c4014d4.zip
Fix function call. check_cache_dir was renamed to check_dir in r6191
-rw-r--r--NEWS2
-rwxr-xr-xmgaapplet4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2264a9a8..447ca2f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix urpm::check_dir() call (old name check_cache_dir() was changed)
+
Version 2.79 - 15 April 2013, Thierry Vignaud
- check that choosen download directory is owned by root (mga#6083)
diff --git a/mgaapplet b/mgaapplet
index e1df0fdd..81be6260 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -401,7 +401,7 @@ sub confirm_upgrade() {
$temp_dir = $_[0]->get_current_folder;
my $ok = 1;
require urpm;
- urpm::check_cache_dir({ fatal => sub { $ok = 0 } }, $temp_dir);
+ urpm::check_dir({ fatal => sub { $ok = 0 } }, $temp_dir);
$ok or ask_warn(N("Error"), N("You must choose a directory owned by the super administrator!"));
});
$browse->set_current_folder($download_dir);
@@ -436,7 +436,7 @@ sub confirm_upgrade() {
if ($res) {
require urpm;
my $ok = 1;
- urpm::check_cache_dir({ fatal => sub { $ok = 0 } }, $temp_dir);
+ urpm::check_dir({ fatal => sub { $ok = 0 } }, $temp_dir);
$ok or goto &confirm_upgrade;
$download_dir = $temp_dir;
really_confirm_upgrade();