Attachment 6519 Details for Bug 15257 – (getNeededMinSpace) split it out

[patch] (getNeededMinSpace) split it out

0001-getNeededMinSpace-split-it-out.patch (text/plain), 1.41 KB, created by Thierry Vignaud on 2015-05-12 10:33:17 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-12 10:33:17 CEST

Size: 1.41 KB

patch

obsolete

>From d94985e058622d1341b5468c97befd33241901a9 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Tue, 12 May 2015 04:27:38 -0400
>Subject: [PATCH 1/2] (getNeededMinSpace) split it out
>
>needed for mga#15257
>---
> perl-install/fs/any.pm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
>index 3021cd5..ce85c61 100644
>--- a/perl-install/fs/any.pm
>+++ b/perl-install/fs/any.pm
>@@ -93,8 +93,8 @@ sub prepare_minimal_root() {
>     eval { fs::mount::sys_kernel_debug($::prefix) };
> }
> 
>-sub getAvailableSpace {
>-    my ($fstab, $o_skip_mounted) = @_;
>+sub getNeededMinSpace {
>+    my ($n) = @_;
> 
>     #- make sure of this place to be available for installation, this could help a lot.
>     #- currently doing a very small install use 36Mb of postinstall-rpm, but installing
>@@ -102,9 +102,15 @@ sub getAvailableSpace {
>     #- 65mb may be a good choice to avoid almost all problem of insuficient space left...
>     my $minAvailableSize = 65 * sqr(1024);
> 
>+    max(0.1 * $n, $minAvailableSize);
>+}
>+
>+sub getAvailableSpace {
>+    my ($fstab, $o_skip_mounted) = @_;
>+
>     my $n = !$::testing && !$o_skip_mounted && getAvailableSpace_mounted($::prefix) || 
>             getAvailableSpace_raw($fstab) * 512 / 1.07;
>-    $n - max(0.1 * $n, $minAvailableSize);
>+    $n - getNeededMinSpace($n);
> }
> 
> sub getAvailableSpace_mounted {
>-- 
>2.3.2
>

From d94985e058622d1341b5468c97befd33241901a9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 May 2015 04:27:38 -0400
Subject: [PATCH 1/2] (getNeededMinSpace) split it out

needed for mga#15257
---
 perl-install/fs/any.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 3021cd5..ce85c61 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -93,8 +93,8 @@ sub prepare_minimal_root() {
     eval { fs::mount::sys_kernel_debug($::prefix) };
 }
 
-sub getAvailableSpace {
-    my ($fstab, $o_skip_mounted) = @_;
+sub getNeededMinSpace {
+    my ($n) = @_;
 
     #- make sure of this place to be available for installation, this could help a lot.
     #- currently doing a very small install use 36Mb of postinstall-rpm, but installing
@@ -102,9 +102,15 @@ sub getAvailableSpace {
     #- 65mb may be a good choice to avoid almost all problem of insuficient space left...
     my $minAvailableSize = 65 * sqr(1024);
 
+    max(0.1 * $n, $minAvailableSize);
+}
+
+sub getAvailableSpace {
+    my ($fstab, $o_skip_mounted) = @_;
+
     my $n = !$::testing && !$o_skip_mounted && getAvailableSpace_mounted($::prefix) || 
             getAvailableSpace_raw($fstab) * 512 / 1.07;
-    $n - max(0.1 * $n, $minAvailableSize);
+    $n - getNeededMinSpace($n);
 }
 
 sub getAvailableSpace_mounted {
-- 
2.3.2

Actions: View | Diff

Attachments on bug 15257: 6245 | 6517 | 6518 | 6519 | 6520 | 6521