August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40504 - /tags/stable-2_15_22/storage/
by fehr＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: fehr Date: Mon Aug 27 15:42:17 2007 New Revision: 40504 URL: http://svn.opensuse.org/viewcvs/yast?rev=40504&view=rev Log: Created tag stable-2_15_22 for storage Added: tags/stable-2_15_22/storage/ - copied from r40503, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40503 - /tags/stable-2_15_22/storage/
by fehr＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: fehr Date: Mon Aug 27 15:42:14 2007 New Revision: 40503 URL: http://svn.opensuse.org/viewcvs/yast?rev=40503&view=rev Log: update Removed: tags/stable-2_15_22/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40502 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_lib.ycp
by fehr＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: fehr Date: Mon Aug 27 15:41:53 2007 New Revision: 40502 URL: http://svn.opensuse.org/viewcvs/yast?rev=40502&view=rev Log: set default format options also during create (#304699) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 27 15:41:53 2007 @@ -2,6 +2,7 @@ Mon Aug 27 10:34:10 CEST 2007 - fehr(a)suse.de - add missing tools used by libstorage to Requires (#304213) +- set default format options also during create (#304699) - version 2.15.22 ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Mon Aug 27 15:41:53 2007 @@ -702,9 +702,9 @@ string fstopt = FileSystems::DefaultFstabOptions( new ); if( size(fstopt)>0 && size(new["fstopt"]:"")==0 ) new["fstopt"] = fstopt; + new["fs_options"] = FileSystems::DefaultFormatOptions(new); if( !init ) { - new["fs_options"] = FileSystems::DefaultFormatOptions(new); new["fstopt"] = fstopt; integer max_len = FileSystems::LabelLength( used_fs ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40501 - /tags/stable-2_15_4/kerberos-server/
by mcalmer＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: mcalmer Date: Mon Aug 27 14:52:28 2007 New Revision: 40501 URL: http://svn.opensuse.org/viewcvs/yast?rev=40501&view=rev Log: Created tag stable-2_15_4 for kerberos-server Added: tags/stable-2_15_4/kerberos-server/ - copied from r40500, trunk/kerberos-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40500 - in /trunk/kerberos-server: VERSION package/yast2-kerberos-server.changes src/kerberos-server.desktop
by mcalmer＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: mcalmer Date: Mon Aug 27 14:49:10 2007 New Revision: 40500 URL: http://svn.opensuse.org/viewcvs/yast?rev=40500&view=rev Log: version 2.15.4; fix desktop file Modified: trunk/kerberos-server/VERSION trunk/kerberos-server/package/yast2-kerberos-server.changes trunk/kerberos-server/src/kerberos-server.desktop Modified: trunk/kerberos-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/VERSION?rev=4050… ============================================================================== --- trunk/kerberos-server/VERSION (original) +++ trunk/kerberos-server/VERSION Mon Aug 27 14:49:10 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/kerberos-server/package/yast2-kerberos-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/package/yast2-ke… ============================================================================== --- trunk/kerberos-server/package/yast2-kerberos-server.changes (original) +++ trunk/kerberos-server/package/yast2-kerberos-server.changes Mon Aug 27 14:49:10 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 27 14:46:59 CEST 2007 - mc(a)suse.de + +- version 2.15.4 +- fix desktop file; move module in Net:Advanced Category + +------------------------------------------------------------------- Mon Aug 6 10:15:30 CEST 2007 - mc(a)suse.de - version 2.15.3 Modified: trunk/kerberos-server/src/kerberos-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/src/kerberos-ser… ============================================================================== --- trunk/kerberos-server/src/kerberos-server.desktop (original) +++ trunk/kerberos-server/src/kerberos-server.desktop Mon Aug 27 14:49:10 2007 @@ -1,14 +1,13 @@ [Desktop Entry] Type=Application -Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=kerberos-server - -X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Group=Net_advanced X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= @@ -16,7 +15,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=kerberos-server -Icon=yast-kerberos-server +Icon=yast-kerberos Exec=/sbin/yast2 kerberos-server Name=KerberosServer -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40499 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp
by locilka＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: locilka Date: Mon Aug 27 14:21:11 2007 New Revision: 40499 URL: http://svn.opensuse.org/viewcvs/yast?rev=40499&view=rev Log: - Calling Storage::DeviceMatchFstab with not-translated device name instead of the translated one (Storage::GetTranslatedDevices) (#304269). - 2.15.22 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=40499&r1=4049… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Mon Aug 27 14:21:11 2007 @@ -1 +1 @@ -2.15.21 +2.15.22 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Mon Aug 27 14:21:11 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Aug 27 14:18:25 CEST 2007 - locilka(a)suse.cz + +- Calling Storage::DeviceMatchFstab with not-translated device name + instead of the translated one (Storage::GetTranslatedDevices) + (#304269). +- 2.15.22 + +------------------------------------------------------------------- Thu Aug 23 15:22:12 CEST 2007 - locilka(a)suse.cz - Preselecting new kernel if recommended and installed kernels do Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Mon Aug 27 14:21:11 2007 @@ -596,11 +596,12 @@ * * @param list <map> of definitions to translate * @param string key name in map to translate + * @param string key name in map to keep the old value * @return list <map> of translated definitions * * @see https://bugzilla.novell.com/show_bug.cgi?id=258222 */ - define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate) { + define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate, string key_preserve_as) { // Check whether there is any hardware information that could be used string check_command = sformat ("/usr/bin/find '%1/var/lib/hardware/'", String::Quote (Installation::destdir)); map cmd = (map) SCR::Execute (.target.bash_output, check_command); @@ -634,7 +635,8 @@ string new_val = new_names[i]:default_val; translate[i, key_to_translate] = new_val; - backward_translation[new_val] = default_val; + translate[i, key_preserve_as] = default_val; + backward_translation[new_val] = default_val; i = i + 1; }; @@ -747,11 +749,11 @@ Update::GetProductName(); y2milestone ("fstab: %1", fstab); - fstab = TranslateFsOrCryptoTab (fstab, "spec"); + fstab = TranslateFsOrCryptoTab (fstab, "spec", "spec_old"); y2milestone ("fstab: (translated) %1", fstab); y2milestone ("crtab: %1", crtab); - crtab = TranslateFsOrCryptoTab (crtab, "file"); + crtab = TranslateFsOrCryptoTab (crtab, "file", "file_old"); y2milestone ("crtab: (translated) %1", crtab); return true; @@ -1373,7 +1375,9 @@ boolean ok = size(fstab[0,"spec"]:"")>0 && Storage::DeviceMatchFstab( p_dev, - fstab[0,"spec"]:"" ); + // bugzilla #304269 + // DeviceMatchFstab expects _old_ not _translated_ device + fstab[0,"spec_old"]:fstab[0,"spec"]:"" ); // Why this doesn't match? // Possible reasons: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40498 - in /trunk/squid/src: Makefile.am SquidACL_local_functions.ycp dialogs.ycp helper_functions.ycp helps.ycp popup_dialogs.ycp store_del.ycp
by dfiser＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: dfiser Date: Mon Aug 27 13:39:25 2007 New Revision: 40498 URL: http://svn.opensuse.org/viewcvs/yast?rev=40498&view=rev Log: Created new file with helper functions and some functions moved there. Added more checking in input data. Added: trunk/squid/src/helper_functions.ycp Modified: trunk/squid/src/Makefile.am trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helps.ycp trunk/squid/src/popup_dialogs.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40498&… ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Mon Aug 27 13:39:25 2007 @@ -14,7 +14,8 @@ complex.ycp \ inits.ycp \ store_del.ycp \ - SquidACL_local_functions.ycp + SquidACL_local_functions.ycp \ + helper_functions.ycp desktop_DATA = \ squid.desktop Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functio… ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Mon Aug 27 13:39:25 2007 @@ -33,6 +33,8 @@ import "Squid"; +include "squid/helper_functions.ycp"; + list<string> splitToChars(string str) { integer len = size(str); @@ -46,10 +48,6 @@ return (ret); } -boolean isIPAddr(string str) -{ - return regexpmatch(str, "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$"); -} boolean isMask(string str) { return regexpmatch(str, "^[0-9]+$") || isIPAddr(str); Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40498&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Mon Aug 27 13:39:25 2007 @@ -50,25 +50,6 @@ return false; } -/** - * Returns a widget with setting of units - */ -term sizeUnitWidget(string id) -{ - return `ComboBox(`id(id), " ", - [`item("B"), `item("KB"), `item("MB")]); -} -/** - * Returns a widget with setting of units - */ -term timeUnitWidget(string id) -{ - return `ComboBox(`id(id), " ", - [`item("seconds"), `item("minutes"), `item("hours"), `item("days")]); -} - - - any HttpPortsDialog(){ any ret = nil; @@ -195,6 +176,8 @@ any Cache2Dialog(){ any ret = nil; string cache_dir = ""; + any tmp = nil; + any tmp2 = nil; term dialog_contents = `VCenter( `HBox( @@ -252,11 +235,11 @@ `Bottom(`PushButton(`id(`browse_cache_dir), Label::BrowseButton())) )), `VSpacing(0.4), - `IntField(`id("mbytes"), _("Size (in MB)"), 0, 99999, 0), + `IntField(`id("mbytes"), _("Size (in MB)"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l1dirs"), _("Level 1 Directories"), 0, 99999, 0), + `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l2dirs"), _("Level 2 Directories"), 0, 99999, 0) + `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 1) ) )) ), @@ -266,6 +249,14 @@ Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, HELPS["cache2"]:"", Label::BackButton(), Label::NextButton()); + UI::ChangeWidget(`id("cache_max_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Notify, true); + + UI::ChangeWidget(`id("cache_swap_low"), `Notify, true); + UI::ChangeWidget(`id("cache_swap_high"), `Notify, true); + InitCache2Dialog(); while (true){ @@ -284,6 +275,36 @@ if (cache_dir != nil){ UI::ChangeWidget(`id("cache_dir"), `Value, cache_dir); } + + //cache_min_object_size <= cache_max_object_size + }else if (ret == "cache_min_object_size" || ret == "cache_min_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_max_object_size"), `Value, UI::QueryWidget(`id("cache_min_object_size"), `Value)); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Value, UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + } + }else if (ret == "cache_max_object_size" || ret == "cache_max_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_min_object_size"), `Value, UI::QueryWidget(`id("cache_max_object_size"), `Value)); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Value, UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + } + + //cache_swap_low <= cache_swap_high + }else if (ret == "cache_swap_low"){ + tmp = UI::QueryWidget(`id("cache_swap_low"), `Value); + if ((integer)tmp > (integer)UI::QueryWidget(`id("cache_swap_high"), `Value)) + UI::ChangeWidget(`id("cache_swap_high"), `Value, tmp); + }else if (ret == "cache_swap_high"){ + tmp = UI::QueryWidget(`id("cache_swap_high"), `Value); + if ((integer)UI::QueryWidget(`id("cache_swap_low"), `Value) > (integer)tmp) + UI::ChangeWidget(`id("cache_swap_low"), `Value, tmp); } } Added: trunk/squid/src/helper_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helper_functions.ycp?r… ============================================================================== --- trunk/squid/src/helper_functions.ycp (added) +++ trunk/squid/src/helper_functions.ycp Mon Aug 27 13:39:25 2007 @@ -0,0 +1,112 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/squid/helper_functions.ycp + * Package: Configuration of squid + * Summary: Helper functions for various situations. + * Authors: Daniel Fiser <dfiser(a)suse.cz> + * + * $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ +{ +textdomain "squid"; + +import "FileUtils"; + + +/** + * Returns a widget with setting of units + */ +term sizeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("KB"), `item("MB")]); +} + +/** + * Returns multiple which equals to given parameter. + */ +integer unitToMultiple(string unit) +{ + if (unit == "KB") return 1024; + if (unit == "MB") return 1024*1024; +} + + +/** + * Returns a widget with setting of units + */ +term timeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("seconds"), `item("minutes"), `item("hours"), `item("days")]); +} + + +boolean isCorrectPathnameOfLogFile(string str) +{ + boolean ok = regexpmatch(str, "^/([^/]+/)*[^/]+$"); + if (ok){ + list<string> dir = regexptokenize(str, "^(.+)/[^/]+$"); + if (!FileUtils::IsDirectory(dir[0]:"/")) + ok = false; + } + return ok; +} + +boolean isIPAddr(string str) +{ + boolean ok = true; + list<string> l = regexptokenize(str, "^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)$"); + + if (size(l) != 4){ + ok = false; + }else{ + integer i = 0; + foreach (string value, l, + { + i = tointeger(value); + if (i < 0 || i > 255){ + ok = false; + break; + } + }); + } + + return ok; +} + +boolean isHostName(string str) +{ + //max 22 chars length + //see http://www.no-ip.com/support/faq/EN/dynamic_ddns/what_is_a_valid_hostname.h… + return regexpmatch(str, "^[a-zA-Z0-9][a-zA-Z0-9-]{0,21}$"); +} + +boolean isCorrectHost(string host) +{ + if (!isIPAddr(host) && !isHostName(host)) + return false; + return true; +} + + +} Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=40498&r1… ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Mon Aug 27 13:39:25 2007 @@ -20,9 +20,7 @@ /** * File: include/squid/helps.ycp - * Package: Configuration of squid - * Summary: Help texts of all the dialogs except AddEditACLDialog. - * Authors: Daniel Fiser <dfiser(a)suse.cz> + * Package: Configuration of squid * Summary: Help texts of all the dialogs except AddEditACLDialog. * Authors: Daniel Fiser <dfiser(a)suse.cz> * * $Id: helps.ycp 27914 2006-02-13 14:32:08Z locilka $ */ @@ -96,7 +94,7 @@ "cache2" : _("Cache memory defines the ideal amount of memory to be used for objects.") + _("Max Object Size defines maximum size for objects to be stored -in the disk.") + +in the disk. Objects larger than this size will not be saved on disk.") + _("Min Object Size specifies the minimum object size below which will not be saved to the disk.") + _("Replacement begins when the swap (disk) usage is above the Modified: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=… ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (original) +++ trunk/squid/src/popup_dialogs.ycp Mon Aug 27 13:39:25 2007 @@ -35,6 +35,7 @@ include "squid/inits.ycp"; include "squid/store_del.ycp"; +include "squid/helper_functions.ycp"; /***************** HTTP PORT ********************/ /** @@ -65,6 +66,7 @@ UI::OpenDialog(`opt(`decorated), contents); UI::ChangeWidget(`id("port"), `ValidChars, "1234567890"); + UI::ChangeWidget(`id("host"), `InputMaxLength, 22); InitAddEditHttpPortDialog(id_item); @@ -95,6 +97,8 @@ any ui = nil; string label = (id_item == nil ? _("Add New Refresh Pattern") : _("Edit Current refresh Pattern")); + any tmp = nil; + term contents = `VBox( `Label(label), @@ -104,9 +108,9 @@ `TextEntry(`id("regexp"), _("Regular Expression"), ""), `Bottom(`CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive"))) )), - `IntField(`id("min"), _("Min (in minutes)"), 0, 99999, 0), + `IntField(`id("min"), `opt(`notify), _("Min (in minutes)"), 0, 99999, 0), `IntField(`id("percent"), _("Percent"), 0, 99999, 0), - `IntField(`id("max"), _("Max (in minutes)"), 0, 99999, 0), + `IntField(`id("max"), `opt(`notify), _("Max (in minutes)"), 0, 99999, 0), `VSpacing(), `VStretch(), @@ -132,6 +136,13 @@ ret = true; break; } + }else if (ui == "min"){ + if ((integer)tmp > (integer)UI::QueryWidget(`id("max"), `Value)) + UI::ChangeWidget(`id("max"), `Value, tmp); + }else if (ui == "max"){ + tmp = UI::QueryWidget(`id("max"), `Value); + if ((integer)UI::QueryWidget(`id("min"), `Value) > (integer)tmp) + UI::ChangeWidget(`id("min"), `Value, tmp); } } Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=4049… ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Mon Aug 27 13:39:25 2007 @@ -43,19 +43,7 @@ include "squid/helps.ycp"; - -/****** help functions **********/ -boolean isCorrectPathnameOfLogFile(string str) -{ - boolean ok = regexpmatch(str, "^/([^/]+/)*[^/]+$"); - if (ok){ - list<string> dir = regexptokenize(str, "^(.+)/[^/]+$"); - if (!FileUtils::IsDirectory(dir[0]:"/")) - ok = false; - } - return ok; -} -/****** help functions END ******/ +include "squid/helper_functions.ycp"; /***************** HTTP_PORT ********************/ boolean StoreDataFromAddEditHttpPortDialog(integer id_item) @@ -64,16 +52,28 @@ string host = (string)UI::QueryWidget(`id("host"), `Value); string port = (string)UI::QueryWidget(`id("port"), `Value); boolean transparent = (boolean)UI::QueryWidget(`id("transparent"), `Value); + string error_msg = ""; - if (size(port) > 0){ + if (size(port) == 0){ + error_msg = error_msg + (size(error_msg)>0 ? "\n" : "") + + _("Port number must not be empty."); + ok = false; + } + if (size(host) > 0 && !isCorrectHost(host)){ + error_msg = error_msg + (size(error_msg)>0 ? "\n" : "") + + _("Host must contain valid ip address or hostname."); + ok = false; + } + + + if (ok){ if (id_item == nil){ Squid::AddHttpPort(host, port, transparent); }else{ Squid::ModifyHttpPort(id_item, host, port, transparent); } }else{ - Report::Error(_("Port number must not be empty.")); - ok = false; + Report::Error(error_msg); } return ok; @@ -166,6 +166,17 @@ Report::Error(_("Cache directory must not be empty.")); }else if (!FileUtils::CheckAndCreatePath(cache_dir)){ ok = false; + }else{ + integer cache_mem = (integer)UI::QueryWidget(`id("cache_mem"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_mem_units"), `Value)); + integer cache_dir_mbytes = (integer)UI::QueryWidget(`id("mbytes"), `Value) * 1024 * 1024; + integer max_obj_size = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + + if (max_obj_size > cache_mem + cache_dir_mbytes){ + ok = false; + Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); + } } if (ok){ @@ -446,16 +457,23 @@ boolean StoreDataFromMiscellaneousDialog() { + boolean ok = true; string error_language = (string)UI::QueryWidget(`id("error_language"), `Value); string cache_mgr = (string)UI::QueryWidget(`id("cache_mgr"), `Value); string ftp_passive = (boolean)UI::QueryWidget(`id("ftp_passive"), `Value) ? "on" : "off"; - Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); - Squid::SetSetting("cache_mgr", [cache_mgr]); - Squid::SetSetting("ftp_passive", [ftp_passive]); + if (regexpmatch(cache_mgr, "[ \t\n]")){ + ok = false; + Report::Error( _("Administrator's E-mail must not contain any white spaces.")); + } - return true; + if (ok){ + Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); + Squid::SetSetting("cache_mgr", [cache_mgr]); + Squid::SetSetting("ftp_passive", [ftp_passive]); + } + + return ok; } -/********************* STORING + DELETING END ********************/ } /* vim: set sw=4 ts=4 et ft=ycp : */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40497 - /tags/stable-2_15_22/storage/
by fehr＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: fehr Date: Mon Aug 27 12:26:37 2007 New Revision: 40497 URL: http://svn.opensuse.org/viewcvs/yast?rev=40497&view=rev Log: Created tag stable-2_15_22 for storage Added: tags/stable-2_15_22/storage/ - copied from r40496, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40496 - in /trunk/storage: VERSION package/yast2-storage.changes
by fehr＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: fehr Date: Mon Aug 27 12:26:32 2007 New Revision: 40496 URL: http://svn.opensuse.org/viewcvs/yast?rev=40496&view=rev Log: version 2.15.22 Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=40496&r1=404… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Aug 27 12:26:32 2007 @@ -1 +1 @@ -2.15.21 +2.15.22 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 27 12:26:32 2007 @@ -2,6 +2,7 @@ Mon Aug 27 10:34:10 CEST 2007 - fehr(a)suse.de - add missing tools used by libstorage to Requires (#304213) +- version 2.15.22 ------------------------------------------------------------------- Mon Aug 20 19:25:39 CEST 2007 - fehr(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40495 - /tags/stable-2_15_6/product-creator/
by jsuchome＠svn.opensuse.org 27 Aug '07

27 Aug '07

Author: jsuchome Date: Mon Aug 27 12:13:51 2007 New Revision: 40495 URL: http://svn.opensuse.org/viewcvs/yast?rev=40495&view=rev Log: Created tag stable-2_15_6 for product-creator Added: tags/stable-2_15_6/product-creator/ - copied from r40494, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0