Skip to content

Commit b2cf3e9

Browse files
authored
Merge pull request #162 from eputnam/unit_output
(MODULES-3881) in which unit output is corrected and whitespace removed
2 parents bd6ef9f + f0ec01e commit b2cf3e9

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

lib/puppet/provider/filesystem/aix.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def create
5555
self.size= (@resource[:size])
5656
end
5757
end
58-
5958
end
6059

6160
def attribute_flag(pvalue)
@@ -139,7 +138,7 @@ def blk_to_val(blocks,units=nil)
139138
when 'M'
140139
sprintf('%gM', Float(blocks.to_i/2/1024))
141140
when 'G'
142-
sprintf('%gM', Float(blocks.to_i/2/1024/1024))
141+
sprintf('%gG', Float(blocks.to_i/2/1024/1024))
143142
else
144143
blocks
145144
end

lib/puppet/type/filesystem.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
newparam(:ag_size) do
3939
desc "Specify the allocation group size in megabytes, AIX only."
4040
newvalues(/\d+/)
41-
end
42-
41+
end
42+
4343
newparam(:large_files) do
4444
desc "Large file enabled file system. AIX only"
4545
newvalues(:true, :false)
46-
end
46+
end
4747

4848
newparam(:compress) do
4949
desc "Data compression, LZ or no. AIX only"
@@ -53,8 +53,8 @@
5353
newparam(:frag) do
5454
desc "JFS fragment size in bytes. AIX only"
5555
newvalues(/\d+/)
56-
end
57-
56+
end
57+
5858
newparam(:nbpi) do
5959
desc "Bytes per inode. AIX only"
6060
newvalues(/\d+/)

0 commit comments

Comments
 (0)