bsc#1045098 and bsc#1045103: Suppress popup message from command-line and check alloc_mem parameter. #80
Conversation
|
Changes Unknown when pulling 52e3b9e on gilsonsouza:SLE-12-SP3 into ** on yast:SLE-12-SP3**. |
package/yast2-kdump.changes
Outdated
|
|
||
| - The alloc_mem parameter is verified to be in accordance with | ||
| documentation (bsc#1045098). | ||
| - Pop-up is supppressed from command line when the user enables or |
There was a problem hiding this comment.
TooManyPs exception :) supppressed -> suppressed.
src/clients/kdump.rb
Outdated
| @@ -742,6 +742,11 @@ def cmdKdumpStartup(options) | |||
| Kdump.add_crashkernel_param = true | |||
| alloc_mem_low, alloc_mem_high = options["alloc_mem"].split(',') | |||
| Kdump.allocated_memory = { low: alloc_mem_low, high: alloc_mem_high } | |||
| unless alloc_mem_low.scan(/\D/).empty? && | |||
There was a problem hiding this comment.
The condition looks tricky, specially using scan for that. What about something like:
if alloc_mem_low !~ ALLOC_MEM_REGEXP || (alloc_mem_high && alloc_mem_high !~ ALLOC_MEM_REGEXP
# report error
return false
endAnd you could define the regular expression before the method, explaining what it does (\A and \z are the preferred way of matching beginning and end of line in Ruby):
# Only numbers are allowed as allow_mem_high and allow_mem_low values
ALLOC_MEM_REGEXP = /\A\d+\z/
|
Changes Unknown when pulling 6f361e6 on gilsonsouza:SLE-12-SP3 into ** on yast:SLE-12-SP3**. |
|
Changes Unknown when pulling 2a7a439 on gilsonsouza:SLE-12-SP3 into ** on yast:SLE-12-SP3**. |
| @@ -734,6 +734,8 @@ def cmdKdumpShow(options) | |||
| end | |||
|
|
|||
|
|
|||
| # Only numbers are allowed as allow_mem_high and allow_mem_low values | |||
| ALLOC_MEM_REGEXP = /\D/ | |||
There was a problem hiding this comment.
@gilsonsouza this is not what @imobachgs has suggested. This will wrongly mark "R2D2" as valid input.
There was a problem hiding this comment.
Oh, \D is a non-digit, but that leaves me even more confused
There was a problem hiding this comment.
I just tested:
gilson@linux-8x2s:~/yast-kdump> sudo yast2 kdump startup enable alloc_mem=R2D2
Invalid allocation memory parameter
Use 'yast2 kdump help' for a complete list of available commands.
No description provided.