Changeset 34924

Timestamp:

Jan 14, 2013, 4:17:02 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Merge trunk into tag / Bug: Illegal division by zero at line 63

Location:

tags/ipp-20121218/Nebulous

Files:

• . (modified) (1 prop)
• bin/neb-df (modified) (5 diffs)

tags/ipp-20121218/Nebulous/bin/neb-df

@@ -53 +53 @@
     my $path        = $vol{host};
     if ($names) {
-        $path = $vol{name};
+        $path = $vol{name};
     }
 
@@ -61 +61 @@
     $total_used     += $used;
     my $available   = $total - $used;
-    my $usedper     = ($used / $total) * 100; 
+    my $usedper     = ($used / ($total+1)) * 100;
     my $mountpoint  = $vol{mountpoint};
 
     if ($vol{allocate} == 1) {
-        $allocated_total += $total;
-        $allocated_used += $used;
+        $allocated_total += $total;
+        $allocated_used += $used;
     }
     # indicated the part of the nebulous volume name that matches up with a
-    # local volume (mountpoint) 
+    # local volume (mountpoint)
     #$path =~ s/$mountpoint/[$mountpoint]/;
 
@@ -95 +95 @@
 
 my $total_available   = $total_total - $total_used;
-my $total_usedper     = ($total_used / $total_total) * 100; 
+my $total_usedper     = ($total_used / $total_total) * 100;
 
 # summary
@@ -112 +112 @@
 
 my $allocated_available   = $allocated_total - $allocated_used;
-my $allocated_usedper     = ($allocated_used / $allocated_total) * 100; 
+my $allocated_usedper     = ($allocated_used / $allocated_total) * 100;
 
 # summary
@@ -188 +188 @@
 =item * C<NEB_PASS>
 
-Equivalent to --pass|-p 
+Equivalent to --pass|-p
 
 =back