February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55395 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: lslezak Date: Tue Feb 10 16:13:51 2009 New Revision: 55395 URL: http://svn.opensuse.org/viewcvs/yast?rev=55395&view=rev Log: - DBus service - added NULL checks, string->YCPTerm automatic conversion Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 10 16:13:51 2009 @@ -14,6 +14,7 @@ #include <y2/Y2Namespace.h> #include <y2/Y2Function.h> #include <y2/Y2PluginComponent.h> +#include <ycp/Parser.h> #include <ycp/y2log.h> #include <YCP.h> @@ -187,7 +188,7 @@ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING; break; /* a{sv} */ case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; - case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; +// case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; default : y2warning("Value type %d is not supported", vt); break; } @@ -238,7 +239,7 @@ } /* - convert string starting with '`' to YCPSymbol + convert string starting with '`' to YCPSymbol or YCPTerm convert string starting with '.' to YCPPath */ YCPValue DBusModulesServer::AutoCast(const YCPValue &value, constTypePtr requested_type) @@ -251,8 +252,11 @@ { if (!value_str.empty() && value_str[0] == '`') { + // remove the leading backtick + value_str.erase(value_str.begin()); + y2milestone("Automatic cast: string -> YCPSymbol"); - return YCPSymbol(value_str); + return YCPSymbol(std::string(value_str)); } } else if (requested_type->isPath()) @@ -263,6 +267,40 @@ return YCPPath(value_str); } } + else if (requested_type->isTerm()) + { + if (!value_str.empty() && value_str[0] == '`') + { + y2milestone("Automatic cast: string -> YCPTerm"); + + // parse the string, recreate the YCPTerm again + Parser parser(value_str.c_str()); + parser.setBuffered(); + YCodePtr p = parser.parse(); + YCPValue contents = YCPNull (); + + if (!p) + { + y2error("Parse error in YCP value: %s", value_str.c_str()); + } + else + { + // for security reasons do the evaluation only if it's a term! + constTypePtr tptr = p->type(); + + if (tptr && tptr->isTerm()) + { + return p->evaluate(true); + } + + y2error("Not an YCP term: %s", value_str.c_str()); + } + } + } + else + { + y2debug("Automatic cast is not defined for the current arguments"); + } } return value; @@ -289,74 +327,99 @@ if (t) { - constFunctionTypePtr fptr = constFunctionTypePtr(t); - int reqarg = fptr->parameterCount(); + constFunctionTypePtr fptr(t); - if (request.arguments() == reqarg) + if (fptr) { - // TODO improve it, Y2Namespace was already found in searchFuncType() - Y2Namespace *ns = nsmap[object]; + int reqarg = fptr->parameterCount(); - if (ns) + if (request.arguments() == reqarg) { - // create function call - Y2Function *y2func = ns->createFunctionCall(method.c_str(), t); + // TODO improve it, Y2Namespace was already found in searchFuncType() + Y2Namespace *ns = nsmap[object]; - if (y2func) + if (ns) { - int index = 0; - bool valid_arguments = true; + // create function call + Y2Function *y2func = ns->createFunctionCall(method.c_str(), t); - while(index < reqarg) + if (y2func) { - YCPValue arg = request.getYCPValue(index); + int index = 0; + bool valid_arguments = true; - // check the data type compatibility - constTypePtr argtype(fptr->parameterType(index)); - - if (argtype->matchvalue(arg) < 0) + while(index < reqarg) { - if (interface == "org.opensuse.yast.modules.Values") - { - // try converting DBus types to YCPValues in the raw interface - arg = AutoCast(arg, argtype); - // do the typecheck again - valid_arguments = argtype->matchvalue(arg) < 0; - } - else + YCPValue arg = request.getYCPValue(index); + + if (arg.isNull()) { + y2error("NULL parameter"); valid_arguments = false; + break; } - if (!valid_arguments) + // check the data type compatibility + constTypePtr argtype(fptr->parameterType(index)); + + if (argtype->matchvalue(arg) < 0) { - y2error("Invalid argument %d (%s): Function %s::%s() requires type '%s' instead of '%s'", - index, arg->toString().c_str(), object.c_str(), method.c_str(), - argtype->toString().c_str(), Type::vt2type(arg->valuetype())->toString().c_str() - ); - break; + if (interface == "org.opensuse.yast.modules.Values") + { + // try converting DBus types to YCPValues in the raw interface + YCPValue casted = AutoCast(arg, argtype); + + if (casted.isNull()) + { + y2error("Automatic cast failed (nil returned)"); + valid_arguments = false; + } + else + { + arg = casted; + // do the typecheck again + valid_arguments = argtype->matchvalue(arg) >= 0; + } + } + else + { + valid_arguments = false; + } + + if (!valid_arguments) + { + y2error("Invalid argument %d (%s): Function %s::%s() requires type '%s' instead of '%s'", + index, arg->toString().c_str(), object.c_str(), method.c_str(), + argtype->toString().c_str(), Type::vt2type(arg->valuetype())->toString().c_str() + ); + break; + } } - } - y2func->appendParameter(arg); - index ++; - } + y2func->appendParameter(arg); + index ++; + } - if (valid_arguments && y2func->finishParameters()) - { - // call the function - ret = y2func->evaluateCall(); - } - else - { - y2error("Wrong parameters to function %s", method.c_str()); + if (valid_arguments && y2func->finishParameters()) + { + // call the function + ret = y2func->evaluateCall(); + } + else + { + y2error("Wrong parameters to function %s", method.c_str()); + } } } } + else + { + y2error("Function %s got %d parameters instead of %d", method.c_str(), request.arguments(), fptr->parameterCount()); + } } else { - y2error("Function %s got %d parameters instead of %d", method.c_str(), request.arguments(), fptr->parameterCount()); + y2internal("Function %s was not found although it was registered", method.c_str()); } } else -- 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] r55394 - in /trunk/storage/storage/src/include: lvm_lib.ycp partition_defines.ycp
by aschnell＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: aschnell Date: Tue Feb 10 15:25:56 2009 New Revision: 55394 URL: http://svn.opensuse.org/viewcvs/yast?rev=55394&view=rev Log: - removed kmgt_str_to_byte Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/partition_defines.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Tue Feb 10 15:25:56 2009 @@ -50,25 +50,6 @@ return( lvm_vg ); }; -////////////////////////////////////////////////////////////////////// -// pesize to byte -// in: <number>[kKmM][bB] -// -// return "0" if input is invalid -// -// pesize is valid 8kB to 512MB in power of 2 -// used by autoyast -define integer pesize_str_to_byte(string input) -{ - integer ret = kmgt_str_to_byte(input); - - if (!Integer::IsPowerOfTwo(ret)) - ret = 0; - else if (ret < 8*1024 || ret > 512*1024*1024) - ret = 0; - return ret; -}; - ////////////////////////////////////////////////////////////////////// // Let the User create a new Volume group: open dialog ... Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Tue Feb 10 15:25:56 2009 @@ -33,89 +33,6 @@ textdomain "storage"; -////////////////////////////////////////////////////////////////////// -// size str to byte -// in: <number>[kKmM][bB] -// -// return "0" if input is invalid -// -// 8 is 8k -// 16K == 16k == 16KB == 16kb -// TODO: remove -define integer kmgt_str_to_byte( string input ) -{ - integer number = 0; - integer pos = findfirstnotof( input, " +" ); - - if( pos != nil && pos>0 ) - { - input = substring( input, pos ); - } - - if( size(filterchars(input, "0123456789kKmMgGtTbBoO .")) != size(input)) - { - return(0); - } - - input = filterchars(input, "0123456789kKmMgGtTbBoO."); - - if( size(input)>0 && findfirstnotof( input, "0123456789.") != nil ) - { - // check whether the last char is in "kKmM" or "bB" - string last_char = substring( input, size(input)-1, 1); - - if( last_char == "b" || last_char == "B" || - last_char == "o" || last_char == "O" ) - { - input = substring( input, 0, size(input)-1); - // check whether the last char is in "kKmM" - last_char = substring( input, size(input)-1, 1); - } - - string number_str = substring(input, 0, size(input)-1); - - if( findfirstnotof( number_str, "0123456789.") == nil ) - { - if( last_char == "k" || last_char == "K" ) - { - number = tointeger(tofloat( number_str ) * 1024.0) ; - } - else if ( last_char == "m" || last_char == "M" ) - { - number = tointeger(tofloat( number_str ) * 1024.0 * 1024.0); - } - else if ( last_char == "g" || last_char == "G" ) - { - number = tointeger(tofloat( number_str ) * - 1024.0 * 1024.0 * 1024.0); - } - else if ( last_char == "t" || last_char == "T" ) - { - number = tointeger(tofloat( number_str ) * - 1024.0 * 1024.0 * 1024.0 * 1024.0); - } - else - { - number = 0; - } - } - else - { - number = 0; - } - } - else if( size(input)==0 ) - { - number = 0; - } - else - { - number = tointeger( input ); - } - return( number ); - }; - - /*--------------------------------------------------------------------- * get a list of not used mountpoints *------------------------------------ -- 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] r55393 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp src/modules/AutoinstStorage.ycp
by ug＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: ug Date: Tue Feb 10 15:18:27 2009 New Revision: 55393 URL: http://svn.opensuse.org/viewcvs/yast?rev=55393&view=rev Log: pesize_str_to_byte replaced Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Feb 10 15:18:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 10 15:06:43 CET 2009 - ug(a)suse.de + +- pesize_str_to_byte replaced by + AutoinstStorage::humanStringToByte + +------------------------------------------------------------------- Mon Feb 9 11:19:44 CET 2009 - ug(a)suse.de - shell escape added for the password for encrypted profiles Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Tue Feb 10 15:18:27 2009 @@ -111,7 +111,7 @@ // Process data lvm = mapmap(string device, map disk, lvm, ``{ - disk["pesize"] = pesize_str_to_byte(disk["pesize"]:"4M"); + disk["pesize"] = AutoinstStorage::humanStringToByte(disk["pesize"]:"4M", true); string vgname = substring(device, 5); disk["partitions"] = maplist(map lv, disk["partitions"]:[], ``{ Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Tue Feb 10 15:18:27 2009 @@ -72,14 +72,11 @@ * */ global define integer humanStringToByte( string s, boolean b ) { - integer result = -1; if( size(s) == 0 ) s = "0b"; if( findfirstnotof( s, "1234567890" ) == nil ) s = s + "b"; - if(! Storage::HumanStringToByte( s, result ) ) - y2milestone("Storage::humanStringToByte failed for %1", s); - return result; + return Storage::ClassicStringToByte(s); } include "autoinstall/autopart.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] r55392 - /tags/branch-Code-11-2_17_53/printer/
by mzugec＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mzugec Date: Tue Feb 10 15:02:25 2009 New Revision: 55392 URL: http://svn.opensuse.org/viewcvs/yast?rev=55392&view=rev Log: Created tag branch-Code-11-2_17_53 for printer Added: tags/branch-Code-11-2_17_53/printer/ - copied from r55391, branches/SuSE-Code-11-Branch/printer/ -- 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] r55391 - in /branches/SuSE-Code-11-Branch/printer: VERSION package/yast2-printer.changes src/autoconfig.ycp
by mzugec＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mzugec Date: Tue Feb 10 15:02:12 2009 New Revision: 55391 URL: http://svn.opensuse.org/viewcvs/yast?rev=55391&view=rev Log: enable cups autoconfig on 64-bit (bnc#464683) Modified: branches/SuSE-Code-11-Branch/printer/VERSION branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp Modified: branches/SuSE-Code-11-Branch/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/V… ============================================================================== --- branches/SuSE-Code-11-Branch/printer/VERSION (original) +++ branches/SuSE-Code-11-Branch/printer/VERSION Tue Feb 10 15:02:12 2009 @@ -1 +1 @@ -2.17.52 +2.17.53 Modified: branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/p… ============================================================================== --- branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes (original) +++ branches/SuSE-Code-11-Branch/printer/package/yast2-printer.changes Tue Feb 10 15:02:12 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 10 14:58:52 CET 2009 - mzugec(a)suse.cz + +- enable cups autoconfig on 64-bit (bnc#464683) +- 2.17.53 + +------------------------------------------------------------------- Tue Jan 27 16:21:19 CET 2009 - mzugec(a)suse.cz - one more string for translation (bnc#459414) Modified: branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/s… ============================================================================== --- branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp (original) +++ branches/SuSE-Code-11-Branch/printer/src/autoconfig.ycp Tue Feb 10 15:02:12 2009 @@ -360,7 +360,13 @@ { // After the autoconfig settings have been successfully applied, // check if cups-autoconfig should run now: if( cups_autoconfig_triggered ) - { if( ! Printerlib::ExecuteBashCommand( "/usr/lib/cups-autoconfig/cups-autoconfig --add" ) ) + { // Depending on the architecture /usr/lib*/cups-autoconfig/cups-autoconfig could actually + // be /usr/lib/cups-autoconfig/cups-autoconfig (in SLE11 on i586, ia64, ppc, s390) + // or /usr/lib64/cups-autoconfig/cups-autoconfig (in SLE11 on ppc64, s390x, x86_64) + // or /usr/lib32/cups-autoconfig/cups-autoconfig (not in SLE11 but possible in a third-party package). + // If several /usr/lib*/cups-autoconfig/cups-autoconfig exist, simply the first one + // in the ls output which is /usr/lib/cups-autoconfig/cups-autoconfig is used here: + if( ! Printerlib::ExecuteBashCommand( "$( ls -1 /usr/lib*/cups-autoconfig/cups-autoconfig | head -n1 ) --add" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. _("Automatic configuration failed."), Printerlib::result["stderr"]:"" -- 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] r55390 - /tags/stable-2_18_3/printer/
by mzugec＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mzugec Date: Tue Feb 10 15:02:00 2009 New Revision: 55390 URL: http://svn.opensuse.org/viewcvs/yast?rev=55390&view=rev Log: Created tag stable-2_18_3 for printer Added: tags/stable-2_18_3/printer/ - copied from r55389, trunk/printer/ -- 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] r55389 - in /trunk/printer: VERSION package/yast2-printer.changes src/autoconfig.ycp
by mzugec＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mzugec Date: Tue Feb 10 15:01:54 2009 New Revision: 55389 URL: http://svn.opensuse.org/viewcvs/yast?rev=55389&view=rev Log: enable cups autoconfig on 64-bit (bnc#464683) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/autoconfig.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55389&r1=553… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Feb 10 15:01:54 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Feb 10 15:01:54 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 10 15:01:34 CET 2009 - mzugec(a)suse.cz + +- enable cups autoconfig on 64-bit (bnc#464683) +- 2.18.3 + +------------------------------------------------------------------- Mon Feb 9 17:58:31 CET 2009 - mzugec(a)suse.cz - AutoYaST : import Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=5… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Tue Feb 10 15:01:54 2009 @@ -360,7 +360,13 @@ { // After the autoconfig settings have been successfully applied, // check if cups-autoconfig should run now: if( cups_autoconfig_triggered ) - { if( ! Printerlib::ExecuteBashCommand( "/usr/lib/cups-autoconfig/cups-autoconfig --add" ) ) + { // Depending on the architecture /usr/lib*/cups-autoconfig/cups-autoconfig could actually + // be /usr/lib/cups-autoconfig/cups-autoconfig (in SLE11 on i586, ia64, ppc, s390) + // or /usr/lib64/cups-autoconfig/cups-autoconfig (in SLE11 on ppc64, s390x, x86_64) + // or /usr/lib32/cups-autoconfig/cups-autoconfig (not in SLE11 but possible in a third-party package). + // If several /usr/lib*/cups-autoconfig/cups-autoconfig exist, simply the first one + // in the ls output which is /usr/lib/cups-autoconfig/cups-autoconfig is used here: + if( ! Printerlib::ExecuteBashCommand( "$( ls -1 /usr/lib*/cups-autoconfig/cups-autoconfig | head -n1 ) --add" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message. _("Automatic configuration failed."), Printerlib::result["stderr"]:"" -- 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] r55388 - /trunk/core/dbus/SCR_service/DBusServer.cc
by kkaempf＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: kkaempf Date: Tue Feb 10 15:00:33 2009 New Revision: 55388 URL: http://svn.opensuse.org/viewcvs/yast?rev=55388&view=rev Log: fix Introspect XML Modified: trunk/core/dbus/SCR_service/DBusServer.cc Modified: trunk/core/dbus/SCR_service/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/SCR_service/DBusServer… ============================================================================== --- trunk/core/dbus/SCR_service/DBusServer.cc (original) +++ trunk/core/dbus/SCR_service/DBusServer.cc Tue Feb 10 15:00:33 2009 @@ -371,12 +371,12 @@ " <arg name='path' type='(bsv)' direction='in'/>" " <arg name='ret' type='(bsv)' direction='out'/>" " </method>" +" </interface>" " <interface name='"DBUS_INTERFACE_INTROSPECTABLE"'>" " <method name='Introspect'>" " <arg name='xml_data' type='s' direction='out'/>" " </method>" " </interface>" -" </interface>" "</node>"; // create a reply to the request -- 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] r55387 - in /trunk/storage/storage: doc/README.part.info doc/config.xml.description src/include/do_proposal_flexible.ycp src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: aschnell Date: Tue Feb 10 14:55:27 2009 New Revision: 55387 URL: http://svn.opensuse.org/viewcvs/yast?rev=55387&view=rev Log: - replaced some calls of kmgt_str_to_byte Modified: trunk/storage/storage/doc/README.part.info trunk/storage/storage/doc/config.xml.description trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/doc/README.part.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/doc/README.part.… ============================================================================== --- trunk/storage/storage/doc/README.part.info (original) +++ trunk/storage/storage/doc/README.part.info Tue Feb 10 14:55:27 2009 @@ -67,7 +67,7 @@ PARTITION - Example: PARTITION mount=/ size=4G fsys=reiser + Example: PARTITION mount=/ size=4GB fsys=reiser Description: Lines starting with the keyword "PARTITION" describe a partition that is @@ -79,7 +79,7 @@ General remarks to all option values. If there is a blank or a equal sign (=) contained in an option value, the values has to be surrounded by double quotes ("). Values that describe sizes can be followed by the - letters K, M, G. (K means Kilobytes, M Megabytes and G Gigabytes). + letters kB, MB, GB, TB. Keyword: mount Example: mount=/ @@ -122,7 +122,7 @@ on a disk. Keyword: size - Example: size=2G + Example: size=2GB Example: size=0 Example: size=auto Description: @@ -140,7 +140,7 @@ percentage of the available space for installation on a disk. Keyword: maxsize - Example: maxsize=4G + Example: maxsize=4GB Description: This keyword limits the maximal amount of space that is allocated to a certain partition. This keyword is only useful in conjunction @@ -172,9 +172,9 @@ without disk keyword is implicity assigned the highest priority 0. Example: PARTITION mount=/var sizepct=100 disk=3 - PARTITION mount=/ size=1G disk=2 - PARTITION mount=/usr size=2G disk=2 - PARTITION mount=/opt size=2G disk=2 + PARTITION mount=/ size=1GB disk=2 + PARTITION mount=/usr size=2GB disk=2 + PARTITION mount=/opt size=2GB disk=2 PARTITION mount=/home sizepct=100 disk=1 If in the above example the machine has three disks then each of the Modified: trunk/storage/storage/doc/config.xml.description URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/doc/config.xml.d… ============================================================================== --- trunk/storage/storage/doc/config.xml.description (original) +++ trunk/storage/storage/doc/config.xml.description Tue Feb 10 14:55:27 2009 @@ -11,7 +11,7 @@ This is the lower limit of available disk space that the code tries to create a proposal with a separate filesystem for /home. If for some reason less disk space than this is available no separate /home will be proposed. - Current Value SL: 5G SLES: 5G SLED: 14G + Current Value SL: 5GB SLES: 5GB SLED: 14GB root_space_percent: This is the percentage of available disk space to use for the root @@ -24,14 +24,14 @@ root_base_size: Minimal size of root filesystem if a separate filesystem for /home is to be created. - Current Value SL: 3G SLES: 3G SLED: 3G + Current Value SL: 3GB SLES: 3GB SLED: 3GB root_max_size: Maximal size of root filesystem if a separate filesystem for /home is to be created. The proposal will not suggest to create a larger root filesystem than this limit. Instead it will add the unused space to the filesystem for /home. - Current Value SL: 10G SLES: 10G SLED: 10G + Current Value SL: 10GB SLES: 10GB SLED: 10GB proposal_lvm: Determines if a proposal based on LVM is created as default. Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_p… ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Tue Feb 10 14:55:27 2009 @@ -1866,7 +1866,7 @@ if (p["maxsize"]:"" != "") { - partition["maxsize"] = kmgt_str_to_byte(p["maxsize"]:""); + partition["maxsize"] = Storage::ClassicStringToByte(p["maxsize"]:""); } if (p["fsys"]:"" != "") @@ -1891,7 +1891,7 @@ } else { - partition["size"] = kmgt_str_to_byte( s ); + partition["size"] = Storage::ClassicStringToByte(s); } } @@ -2076,7 +2076,7 @@ } else { - part["size"] = kmgt_str_to_byte( par ); + part["size"] = Storage::ClassicStringToByte(par); } } else if( key == "label" ) @@ -2085,7 +2085,7 @@ } else if( key == "maxsize" ) { - part[key] = kmgt_str_to_byte( par ); + part[key] = Storage::ClassicStringToByte(par); } else if( key == "sizepct" ) { Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Feb 10 14:55:27 2009 @@ -367,6 +367,15 @@ } +global integer ClassicStringToByte(string str) +{ + integer bytes = 0; + if (!LibStorage::humanStringToByte(str, true, bytes)) + y2error("cannot parse %1", str); + return bytes; +} + + global string ByteToHumanString(integer bytes) { return LibStorage::byteToHumanString(bytes, false, 2, false); @@ -6307,14 +6316,6 @@ global map<string, any> GetControlCfg() { - integer StrToByte(string str) - { - integer bytes = 0; - if (!LibStorage::humanStringToByte(str, true, bytes)) - y2error("cannot parse %1", str); - return bytes; - } - if (size(cfg_xml) == 0) { boolean bt = ProductFeatures::GetBooleanFeature( "partitioning", @@ -6329,31 +6330,31 @@ string tmp = ProductFeatures::GetStringFeature( "partitioning", "limit_try_home"); - cfg_xml["home_limit"] = StrToByte(tmp) / (1024*1024); + cfg_xml["home_limit"] = ClassicStringToByte(tmp) / (1024*1024); if( cfg_xml["home_limit"]:0 <= 0 ) cfg_xml["home_limit"] = 5*1024; tmp = ProductFeatures::GetStringFeature( "partitioning", "root_base_size"); - cfg_xml["root_base"] = StrToByte(tmp) / (1024*1024); + cfg_xml["root_base"] = ClassicStringToByte(tmp) / (1024*1024); if( cfg_xml["root_base"]:0 <= 0 ) cfg_xml["root_base"] = 3*1024; tmp = ProductFeatures::GetStringFeature( "partitioning", "root_max_size"); - cfg_xml["root_max"] = StrToByte(tmp) / (1024*1024); + cfg_xml["root_max"] = ClassicStringToByte(tmp) / (1024*1024); if( cfg_xml["root_max"]:0 <= 0 ) cfg_xml["root_max"] = 10*1024; tmp = ProductFeatures::GetStringFeature( "partitioning", "vm_desired_size"); - cfg_xml["vm_want"] = StrToByte(tmp) / (1024*1024); + cfg_xml["vm_want"] = ClassicStringToByte(tmp) / (1024*1024); if( cfg_xml["vm_want"]:0 <= 0 ) cfg_xml["vm_want"] = 15*1024; tmp = ProductFeatures::GetStringFeature( "partitioning", "vm_home_max_size"); - cfg_xml["home_max"] = StrToByte(tmp) / (1024*1024); + cfg_xml["home_max"] = ClassicStringToByte(tmp) / (1024*1024); if( cfg_xml["home_max"]:0 <= 0 ) cfg_xml["home_max"] = 25*1024; -- 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] r55386 - /trunk/qt-graph/src/QY2Graph.cc
by aschnell＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: aschnell Date: Tue Feb 10 13:20:26 2009 New Revision: 55386 URL: http://svn.opensuse.org/viewcvs/yast?rev=55386&view=rev Log: - use determinant for scale factor calculation since it is invariant to rotations Modified: trunk/qt-graph/src/QY2Graph.cc Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=553… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Tue Feb 10 13:20:26 2009 @@ -96,9 +96,12 @@ void QY2Graph::scaleView(qreal scaleFactor) { - qreal factor = matrix().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width(); - if (factor < 0.05 || factor > 10) - return; + qreal f = sqrt(matrix().det()); + + if (scaleFactor * f > 8.0) + scaleFactor = 8.0 / f; + if (scaleFactor * f < 0.1) + scaleFactor = 0.1 / f; scale(scaleFactor, scaleFactor); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0