summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-28 19:22:12 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-28 19:22:12 +0000
commitfe28c4ede7e3dc145ffd88c70d75dbcce4093dda (patch)
tree28115a03b8271d73b3f5c5a07a6d34c34cdf1393
parente5e23d39061d2356c0e1da2134f5e665b2453fb1 (diff)
downloaddrakx-fe28c4ede7e3dc145ffd88c70d75dbcce4093dda.tar
drakx-fe28c4ede7e3dc145ffd88c70d75dbcce4093dda.tar.gz
drakx-fe28c4ede7e3dc145ffd88c70d75dbcce4093dda.tar.bz2
drakx-fe28c4ede7e3dc145ffd88c70d75dbcce4093dda.tar.xz
drakx-fe28c4ede7e3dc145ffd88c70d75dbcce4093dda.zip
(call_blkid) do not bypass blkid cache
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/type.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 101536c09..51d224bf9 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- do not bypass blkid cache
+
Version 15.14 - 17 December 2012
- ugtk2: use new exceptions management
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 528804655..72b7b54e4 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -273,7 +273,7 @@ sub call_blkid {
my %h = map {
if_(/(.*?)=(.*)/, $1 => $2);
- } run_program::get_stdout_raw({ timeout => 30 }, 'blkid', '2>', '/dev/null', '-o', 'udev', '-p', devices::make($part->{device}));
+ } run_program::get_stdout_raw({ timeout => 30 }, 'blkid', '2>', '/dev/null', '-o', 'udev', devices::make($part->{device}));
\%h;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5fe14fa72..70261e31a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not bypass blkid cache
+
Version 15.16 - 28 December 2012
- adapt to new help layout (mga#5634)