summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-12 04:28:41 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-18 04:45:07 +0200
commit41e7676d8b316a5a7425cd9d9ee433f52d6a338d (patch)
tree41b8e48faf028580b26fbae0cc5d6c39761307b1
parent97a7904701e5fe02af2c95c5eb0ffb83a7707b6d (diff)
downloaddrakx-41e7676d8b316a5a7425cd9d9ee433f52d6a338d.tar
drakx-41e7676d8b316a5a7425cd9d9ee433f52d6a338d.tar.gz
drakx-41e7676d8b316a5a7425cd9d9ee433f52d6a338d.tar.bz2
drakx-41e7676d8b316a5a7425cd9d9ee433f52d6a338d.tar.xz
drakx-41e7676d8b316a5a7425cd9d9ee433f52d6a338d.zip
enables to get raw available space (mga15257)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/any.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index eeb814ee5..2f5762f02 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- library (for draklive-install):
+ o enables to get raw available space (mga15257)
+
Version 16.96 - 17 May 2015
- library (for draklive-install):
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index ce85c616a..5133cae2a 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -106,11 +106,11 @@ sub getNeededMinSpace {
}
sub getAvailableSpace {
- my ($fstab, $o_skip_mounted) = @_;
+ my ($fstab, $o_skip_mounted, $o_skip_min_space) = @_;
my $n = !$::testing && !$o_skip_mounted && getAvailableSpace_mounted($::prefix) ||
getAvailableSpace_raw($fstab) * 512 / 1.07;
- $n - getNeededMinSpace($n);
+ $o_skip_min_space ? $n : $n - getNeededMinSpace($n);
}
sub getAvailableSpace_mounted {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9b865e96d..7de4fcbcd 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+(just to be sure draklive-install fix for mga15257 doesn't break anything)
+
Version 16.96 - 17 May 2015
- partitioning: