Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67742 - in /branches/SuSE-Code-11-SP3-Branch/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
Author: fehr
Date: Thu Mar 29 12:44:59 2012
New Revision: 67742

URL: http://svn.opensuse.org/viewcvs/yast?rev=67742&view=rev
Log:
prevent invalid size values in tmpfs size (bnc#754326)

Modified:
branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes

branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp

Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=67742&r1=67741&r2=67742&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes
(original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Thu
Mar 29 12:44:59 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Mar 29 12:14:35 CEST 2012 - fehr@xxxxxxx
+
+- prevent invalid size values in tmpfs size (bnc#754326)
+
+-------------------------------------------------------------------
Mon Mar 12 16:42:36 CET 2012 - aschnell@xxxxxxx

- 2.17.127

Modified:
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp?rev=67742&r1=67741&r2=67742&view=diff
==============================================================================
---
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
(original)
+++
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
Thu Mar 29 12:44:59 2012
@@ -224,7 +224,8 @@
}
else if( pospct==nil &&
(!Storage::HumanStringToByte( query, sz ) ||
- sz<entry[`min_size]:1 ))
+ sz<entry[`min_size]:1 ||
+ !regexpmatch( query, "^[0-9]+[KMGkmg]$")))
{
Popup::Error(entry[`error_text]:"");
ret = `error;
@@ -252,20 +253,20 @@
ret = `error;
}
}
- if( valid_chars != "" && size(query)>0 && ret != `error )
- {
- if( nil != findfirstnotof( query, valid_chars ))
- {
- Popup::Error(entry[`error_text]:"");
- ret = `error;
- }
- }
if( str_length != 0 && size(query) > str_length && ret != `error )
{
Popup::Error(entry[`error_text]:"");
ret = `error;
}
}
+ if( valid_chars != "" && size(query)>0 && ret != `error )
+ {
+ if( nil != findfirstnotof( query, valid_chars ))
+ {
+ Popup::Error(entry[`error_text]:"");
+ ret = `error;
+ }
+ }
y2milestone( "DoInputChecks value %1 ret %2", query, ret );
return( ret );
}

Modified:
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp?rev=67742&r1=67741&r2=67742&view=diff
==============================================================================
---
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp
(original)
+++
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp
Thu Mar 29 12:44:59 2012
@@ -341,7 +341,7 @@
`min_size : 100*1024,
`valid_chars : "0123456789kKmMgG%",
// popup text
- `error_text : _("Value must be above 100k or between 1% and 200%.
Try again."),
+ `error_text : _("Invalid Size specified. Use number followed by K,
M, G or %.\nValue must be above 100k or between 1% and 200%. Try again."),
`error_text_percent : _("Value must be between 1% and 200%. Try
again."),
`type : `text,
`str_opt : "size=%1",

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages