August 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49587 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 16:29:17 2008 New Revision: 49587 URL: http://svn.opensuse.org/viewcvs/yast?rev=49587&view=rev Log: - removed unneeded function - check TLS settings when enabling ldaps Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 16:29:17 2008 @@ -157,32 +157,34 @@ LdapServer::SetServiceEnabled( false ); } - if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ) - { - LdapServer::SetProtocolListenerEnabled( "ldap", true ); - } - else - { - LdapServer::SetProtocolListenerEnabled( "ldap", false ); - } - + LdapServer::SetProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); + LdapServer::SetProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + map<string, any> tls = LdapServer::GetTlsConfig(); + if ( (string)tls["caCertFile"]:"" != "" && + (string)tls["certFile"]:"" != "" && + (string)tls["certKeyFile"]:"" != "" ) + { + LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + } + else + { + if ( Popup::YesNoHeadline( _("Your TLS/SSL Configuration seems to be incomplete."), + _("Do you really want to enable the \"ldaps\" protocol listener?") ) ) + { + LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + } + else + { + LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + } + } } else { LdapServer::SetProtocolListenerEnabled( "ldaps", false ); } - - if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ) - { - LdapServer::SetProtocolListenerEnabled( "ldapi", true ); - } - else - { - LdapServer::SetProtocolListenerEnabled( "ldapi", false ); - } return true; } @@ -311,28 +313,6 @@ ** tls handlers *****************************/ -define boolean cb_check_tls() -``{ - y2milestone( "calling tls check handler" ); - -// map<string,string> importPaths = LdapServer::ReadImportCertificates(); -// boolean use_common_ca = LdapServer::ReadConfigureCommonServerCertificate(); -// map<string,string> tlsSettings = (map<string,string>)LdapServer::ReadTlsSettings(); -// -// if( (boolean)UI::QueryWidget( `rb_yes, `Value ) && !( -// haskey( importPaths, "ServerCertificateFile" ) || -// use_common_ca || -// ( tlsSettings["TLSCertificateFile"]:nil != nil && tlsSettings["TLSCertificateKeyFile"]:nil != nil ) ) -// ) -// { -// /*error popup*/ -// callback_error = _("Choose a certificate if you want to activate TLS."); -// return false; -// } - - return true; -} - define boolean cb_read_tls() ``{ y2milestone( "calling tls read handler" ); @@ -1021,7 +1001,6 @@ /* Tree item */ "name" : _("TLS Settings"), "widget" : tlsWidget, - "cb_check" : ``( cb_check_tls() ), "cb_read" : ``( cb_read_tls() ), "cb_write" : ``( cb_write_tls() ), "cb_input" : ``( cb_input_tls() ) -- 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] r49586 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 16:29:14 2008 New Revision: 49586 URL: http://svn.opensuse.org/viewcvs/yast?rev=49586&view=rev Log: Don't crash when overwriting existing configuration Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 1 16:29:14 2008 @@ -34,6 +34,7 @@ my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; +my $overwriteConfig = 0; my $serviceEnabled = 0; my $serviceRunning = 1; my $registerSlp = 0; @@ -377,8 +378,9 @@ my $self = shift; y2milestone("LdapServer::Write"); my $ret = 1; - if ( ! $usesBackConfig || ! $slapdConfChanged ) + if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig ) { + $overwriteConfig = 0; my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), _("Creating Configuration"), @@ -606,6 +608,7 @@ { return YaST::YCP::Boolean($usingDefaults); } + ## # Return packages needed to be installed and removed during # Autoinstallation to insure module has all needed software @@ -887,7 +890,8 @@ $self->InitDbDefaults(); } y2milestone(Data::Dumper->Dump([\%dbDefaults])); - $usingDefaults = 1; + $usingDefaults = 1; + $overwriteConfig = 1; return \%dbDefaults; } -- 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] r49585 - in /trunk/storage/storage/src/include: custom_part_dialogs.ycp lvm_lib.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:55:43 2008 New Revision: 49585 URL: http://svn.opensuse.org/viewcvs/yast?rev=49585&view=rev Log: - fixed Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/lvm_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 15:55:43 2008 @@ -38,7 +38,11 @@ include "partitioning/partition_defines.ycp"; include "partitioning/custom_part_helptexts.ycp"; - include "partitioning/signatures.ycp"; + + // TODO: cleanup + boolean check_unique_label( map<string,map> targetMap, map part ); + boolean CheckFstabOptions( map part ); + symbol check_devices_used( list<map> partitions, boolean not_cr ); define string DlgCreateCryptFs( string device, integer minpwlen, boolean format, 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 Fri Aug 1 15:55:43 2008 @@ -22,6 +22,10 @@ include "partitioning/partition_defines.ycp"; + // TODO: cleanup + void new_vg_list( list vg_list ); + + textdomain "storage"; define string lvmVg( string vg ) -- 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] r49584 - in /trunk/storage/storage/src/include: lvm_lib.ycp lvm_ui_lib.ycp signatures.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:46:15 2008 New Revision: 49584 URL: http://svn.opensuse.org/viewcvs/yast?rev=49584&view=rev Log: - removed obsolete code Removed: trunk/storage/storage/src/include/signatures.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_ui_lib.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 Fri Aug 1 15:46:15 2008 @@ -20,7 +20,7 @@ include "partitioning/partition_defines.ycp"; -include "partitioning/signatures.ycp"; + textdomain "storage"; Modified: trunk/storage/storage/src/include/lvm_ui_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_lib.ycp Fri Aug 1 15:46:15 2008 @@ -20,7 +20,6 @@ textdomain "storage"; -#include "partitioning/signatures.ycp"; //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// @@ -175,34 +174,6 @@ ///////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////// -//---------------------------------------------------- -// give bar widget if possible - -define term get_bargraph_or_compatible( string avail_vg_size ) - ``{ - if( UI::HasSpecialWidget( `BarGraph )) - { - return( `HBox( - // label text - `Label(_("Available size:")), - `HSpacing(0.5), - `BarGraph( `id(`vg_size), `opt(`hstretch), - [ 0, 10 ], [ "", ""]) - // `Label( `opt( `outputField), avail_vg_size ) - )); - } - else - { - return( `HBox( - // label text - `Bottom(`Left(`Label(_("Available Size:")))), - `Bottom(`Left(`Label( `id(`vg_size), - `opt( `hstretch, `outputField), avail_vg_size ))), - `HWeight(1,`HStretch()) - // `Label( `opt( `outputField), avail_vg_size ) - )); - } - }; //---------------------------------------------------- // give table for step 2: create volume group, add phys. volumes (pv) @@ -259,70 +230,6 @@ ); }; - - -////////////////////////////////////////////////////////////////////// -// give main page for configuration - X11 version -////////////////////////////////////////////////////////////////////// - -define term get_config_content( list pv_table_list, list lv_table_list, - list vg_list, string phys_vg_size, - string avail_vg_size, boolean view_all_mnts ) - ``{ - return( `HBox( `HSpacing(0.5), - `VBox( - `VSquash(`HBox( - `Left(`ReplacePoint( `id(`rvg ), - `ComboBox(`id(`vg), - `opt(`notify), - // label text - _("V&olume Group Name"), - vg_list ))), - `HSpacing(2), - // button text - `Left(`Bottom(`PushButton( `id(`vg_add_vg), _("A&dd group")))), - `HSpacing(0.5), - // button text - `Left(`Bottom(`PushButton( `id(`vg_remove_vg), _("Remove &group")))), - `HWeight(1,`HStretch()) - )), - `VSpacing(1), - // label text - `Frame(_("Edit the current volume group:"), - `HBox( - `HWeight( 50, - `VBox( - `VSpacing(0.7), - // label text - `Heading(_("Physical volumes")), - `VSpacing(0.7), - `HBox( - // label text - `Label(_("Physical volume size:")), - `Label( `id(`pv_size), `opt(`outputField), phys_vg_size ) - ), - `VSpacing(0.5), - get_pv_table_content( pv_table_list ) - )), - `HWeight( 50, - `VBox( - `VSpacing(0.5), - // label text - `Heading(_("Logical volumes")), - `VSpacing(0.5), - get_bargraph_or_compatible( avail_vg_size ), - `VSpacing(0.2), - get_lv_table_content( lv_table_list, view_all_mnts ) - )) - ) - ) - ), - `HSpacing(0.5) - ) - ); - }; - - ////////////////////////////////////////////////////////////////////// // give main page for step 2: create volume group, add phys. volumes (pv) -- 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] r49583 - /tags/stable-2_17_5/product-creator/
by jsuchome＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: jsuchome Date: Fri Aug 1 15:44:13 2008 New Revision: 49583 URL: http://svn.opensuse.org/viewcvs/yast?rev=49583&view=rev Log: Created tag stable-2_17_5 for product-creator Added: tags/stable-2_17_5/product-creator/ - copied from r49582, 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

[yast-commit] r49582 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: jsuchome Date: Fri Aug 1 15:44:06 2008 New Revision: 49582 URL: http://svn.opensuse.org/viewcvs/yast?rev=49582&view=rev Log: - Image Creator: added GUI to configure image compression - 2.17.5 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4958… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Aug 1 15:44:06 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Aug 1 15:44:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 1 15:36:32 CEST 2008 - jsuchome(a)suse.cz + +- Image Creator: added GUI to configure image compression +- 2.17.5 + +------------------------------------------------------------------- Fri Jul 25 13:02:44 CEST 2008 - jsuchome(a)suse.cz - read the default information for new type from the template Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Aug 1 15:44:06 2008 @@ -58,6 +58,54 @@ * widget handlers ****************************************************************************/ + define void InitCompressionCombo (string id) { + + string current_method = "none"; + foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { + if (typemap[content_key]:"" == kiwi_task) + { + current_method = typemap["flags"]:current_method; + } + }); + map<string,string> methods = $[ + "unified" : "unified", + "compressed" : "compressed", + "unified-cromfs" : "unified-cromfs", + "compressed-cromfs" : "compressed-cromfs", + // combo box label + "none" : _("None") + ]; + list items = maplist (string method, string label, methods, { + return `item (`id (method), label, method == current_method); + }); + UI::ChangeWidget (`id (id), `Items, items); + } + + define void StoreCompressionCombo (string key, map event) { + + string selected = (string) UI::QueryWidget (`id (key), `Value); + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap[content_key]:"" == kiwi_task) + { + if (selected == "none") + { + if (haskey (typemap, "flags")) + typemap = remove (typemap, "flags"); + } + else + typemap["flags"] = selected; + } + return typemap; + }); + } + + define symbol HandleCompressionCombo (string key, map event) { + if (event["ID"]:nil == `next) StoreCompressionCombo (key, event); + return nil; + } + /** * Initialize the widget with ignored packages */ @@ -1233,14 +1281,10 @@ `VBox ( `VSpacing (0.2), `HBox ( - `HWeight (1, "version"), - `HWeight (1, `HBox ("size", "sizeunit")) - /* - `VBox ( - `Label (""), "compressed" - FIXME compressed vs. unified - ) - */ + `HWeight (2, `HBox ( + "version", "size", "sizeunit" + )), + `HWeight (1, "compression") ), `HBox ( `HWeight (2, `VBox ( @@ -1255,7 +1299,7 @@ ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", // "compressed", + "size", "sizeunit", "compression", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1354,6 +1398,18 @@ "store" : StoreCompressCheckBox, "handle" : HandleCompressCheckBox, ], + "compression" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], + // textentry label + "label" : _("Co&mpression"), + // help text + "help" :_("Select the value for image Compression. This will modify the flags value of the image type. Check kiwi manual for the meaning of the available values."), + "init" : InitCompressionCombo, + "store" : StoreCompressionCombo, + "handle" : HandleCompressionCombo, + ], "sw_selection" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], -- 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] r49581 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 15:37:04 2008 New Revision: 49581 URL: http://svn.opensuse.org/viewcvs/yast?rev=49581&view=rev Log: - removed lint - offer to start CA Management Module (Fate#303546) Modified: trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 15:37:04 2008 @@ -483,127 +483,9 @@ string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate Key File") ); if( name != nil ) UI::ChangeWidget( `te_key_file, `Value, name ); } - else if( handler_cmd == `pb_edit ) + else if( handler_cmd == `pb_launch_ca ) { -// //show edit popup - any ret = nil; -// string dlg_name = common_ca_available ? "type" : "import"; -// term dlg = (term)widget_map["g_tls","dialogs",dlg_name]:nil; -// if( dlg == nil ) -// { -// callback_error = _("An internal error occurred. View the log file."); -// y2error( "cb_input_tls: type dialog is not in widget map" ); -// return false; -// } -// -// UI::OpenDialog( dlg ); -// -// map<string,string> importPaths = LdapServer::ReadImportCertificates(); -// if( dlg_name == "input" ) -// { -// UI::ChangeWidget( `te_cert_file, `Value, importPaths["ServerCertificateFile"]:"" ); -// UI::ChangeWidget( `te_key_file, `Value, importPaths["ServerKeyFile"]:"" ); -// UI::ChangeWidget( `te_ca_file, `Value, importPaths["CACertificatesFile"]:"" ); -// } -// -// if( dlg_name == "type" && haskey( importPaths, "ServerCertificateFile" ) ) -// { -// UI::ChangeWidget( `rb_common, `Value, false ); -// UI::ChangeWidget( `rb_import, `Value, true ); -// } -// -// y2milestone( ">>>> entering cb_input_tls input loop..." ); -// while( true ) -// { -// ret = UI::UserInput(); -// y2milestone( "cb_input_tls: dialog returns '%1'", ret ); -// -// if( dlg_name == "type" ) -// { -// if( ret == `cancel ) break; -// else if( ret == `ok ) -// { -// any do_what = UI::QueryWidget( `rbg_type, `CurrentButton ); -// y2milestone( "cb_input_tls: do_what is '%1'", do_what ); -// if( do_what == `rb_common ) -// { -// //TODO: use common ca -// y2milestone( "cb_input_tls: using common server certificate" ); -// LdapServer::WriteConfigureCommonServerCertificate( true ); -// LdapServer::WriteImportCertificates( $[] ); -// break; -// } else if( do_what == `rb_import ) -// { -// UI::CloseDialog(); -// dlg_name = "import"; -// UI::OpenDialog( (term)widget_map["g_tls","dialogs","import"]:`Label(_("Dialog not found"))); -// -// //fill textentries -// UI::ChangeWidget( `te_cert_file, `Value, importPaths["ServerCertificateFile"]:"" ); -// UI::ChangeWidget( `te_key_file, `Value, importPaths["ServerKeyFile"]:"" ); -// UI::ChangeWidget( `te_ca_file, `Value, importPaths["CACertificatesFile"]:"" ); -// continue; -// } -// } -// } else if( dlg_name == "import" ) -// { -// if( ret == `cancel ) break; -// else if( ret == `pb_ca_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select CA Certificate File") ); -// if( name != nil ) UI::ChangeWidget( `te_ca_file, `Value, name ); -// continue; -// } else if( ret == `pb_cert_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate File") ); -// if( name != nil ) UI::ChangeWidget( `te_cert_file, `Value, name ); -// continue; -// } else if( ret == `pb_key_file ) -// { -// /* file selection headline */ -// string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *", _("Select Certificate Key File") ); -// if( name != nil ) UI::ChangeWidget( `te_key_file, `Value, name ); -// continue; -// } else if( ret == `ok ) -// { -// //TODO: import ca -// //read values -// string cert_file = String::CutBlanks( (string)UI::QueryWidget( `te_cert_file, `Value ) ); -// string key_file = String::CutBlanks( (string)UI::QueryWidget( `te_key_file, `Value ) ); -// string ca_file = String::CutBlanks( (string)UI::QueryWidget( `te_ca_file, `Value ) ); -// -// if( cert_file == "" ) -// { -// /* Error Popup */ -// Popup::Error( _("Server certificate file is required.") ); -// continue; -// } -// -// if( key_file == "" ) -// { -// /* Error Popup */ -// Popup::Error( _("Server key file is required.") ); -// continue; -// } -// -// importPaths["ServerCertificateFile"] = cert_file; -// importPaths["ServerKeyFile"] = key_file; -// if( ca_file != "" ) importPaths["CACertificatesFile"] = ca_file; -// -// y2milestone( "importing certificates" ); -// LdapServer::WriteImportCertificates( importPaths ); -// LdapServer::WriteConfigureCommonServerCertificate( false ); -// -// break; -// } -// } -// } -// y2milestone( "<<<< leaving cb_input_tls input loop..." ); -// -// UI::CloseDialog(); -// eval( cb_read_tls() ); + WFM::CallFunction("ca_mgm", [] ); } //reread tls page return true; Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Aug 1 15:37:04 2008 @@ -194,6 +194,10 @@ ) ) ) + ), + `VSpacing( 0.5 ), + `Left( + `PushButton( `id( `pb_launch_ca ), _("Launch CA Management Module") ) ) ) ); -- 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] r49580 - in /trunk/storage/storage/src/include: lvm_lv_lib.ycp lvm_pv_lib.ycp signatures.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:28:07 2008 New Revision: 49580 URL: http://svn.opensuse.org/viewcvs/yast?rev=49580&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/signatures.ycp Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Fri Aug 1 15:28:07 2008 @@ -122,73 +122,6 @@ //////////////////////////////////////////////////////////////////////////////// - // Get all logical volumes and mounted partitions - -define list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap, - boolean view_all_mnts, - string current_vg ) - ``{ - list<map> ret = []; - integer pesize = targetMap["/dev/"+current_vg,"cyl_size"]:(4096*1024); - y2milestone( "current_vg=%2 pesize=%1", pesize, current_vg ); - - ////////////////////////////////////////////////////////////////////// - // add the devicename i.e /dev/hda1 or /dev/system/usr to partition list - // and the device key <subdevice>/<maindevice> i.e. 1//dev/hda - - targetMap = mapmap( string dev, map devmap, targetMap, - ``{ - boolean is_lvm_vg = devmap["type"]:`CT_UNKNOWN==`CT_LVM; - integer cyl_size = devmap["cyl_size"]:0; - - list partitions = maplist( map part, devmap["partitions"]:[], - ``{ - if( is_lvm_vg ) - { - part["lvm_name"] = devmap["name"]:""; - } - part["size_str"] = ByteToHumanStringWithZero(part["size_k"]:0*1024); - - part["maindev"] = dev; - y2debug("devname %1 size %2 pe %3", part["device"]:"", - part["size_k"]:0*1024, pesize ); - return( part ); - }); - - devmap["partitions"] = partitions; - return( $[ dev: devmap ] ); - }); - - //////////////////////////////////////////////////////////// - // Look for all partitions: - // - // normal partition with mountpoint - // logical volume - - if( !view_all_mnts ) - { - string f = "/" + current_vg + "/"; - // only to current vg depending vgs ... - foreach( string dev, map devmap, targetMap, - ``{ - ret = (list<map>)union( ret, filter( map part, devmap["partitions"]:[], - ``( part["type"]:`none == `lvm && - search( part["device"]:"", f )==4 ))); - }); - } - else - { - foreach( string dev, map devmap, targetMap, - ``{ - ret = (list<map>)merge( ret, filter( map part, devmap["partitions"]:[], - ``( size(part["mount"]:"")>0 || - part["type"]:`none == `lvm ))); - }); - } - return( ret ); - }; - - //////////////////////////////////////////////////////////////////////////////// // Get all existing lv names of a volume group list<string> get_lv_names(map<string, map> target_map, string vg_name) Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 15:28:07 2008 @@ -234,61 +234,6 @@ }; - - ////////////////////////////////////////////////////////////////////// - // partition list to widget table - // in: - // [ $["fsid":Partitions::fsid_lvm, - // "fstype":"LVM", - // "nr":"var", - // "region":[255, 16], - // "type":`primary], - // $[ - // "fsid":131, - // "fstype":"Linux native", - // "nr":4, "region":[271, 844], - // ... - // - // out: - // [ - // `item(`id("/dev/hda1"), "/dev/hda1 ", " 2G ", " LVM ", " system"), - // `item(`id("/dev/hda2"), "/dev/hda2 ", " 1G ", " Linux ", " ") - // ]; - -define list get_pv_widget_table( list<map> possPvList ) - ``{ - list ret = []; - - possPvList = - sort( map x, map y, possPvList, - ``{ - if( x["maindev"]:"" == y["maindev"]:"") - { - if( haskey( x, "nr" )) - return( x["nr"]:0 < y["nr"]:0); - else - return( x["name"]:"" < y["name"]:""); - } - else - { - return( x["maindev"]:"" < y["maindev"]:"" ); - } - }); - - return( maplist( map p, possPvList, - ``{ - return(`item( `id(p["device"]:"--"), - p["device"]:"--", - ByteToHumanStringWithZero(p["size_k"]:0*1024), - p["fstype"]:"--", - p["used_by"]:"--" - )); - } - )); - }; - - - /** * Check if the user can delete the partition. * -> Existing LVM partition with volume group Modified: trunk/storage/storage/src/include/signatures.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/sign… ============================================================================== --- trunk/storage/storage/src/include/signatures.ycp (original) +++ trunk/storage/storage/src/include/signatures.ycp Fri Aug 1 15:28:07 2008 @@ -16,8 +16,6 @@ map DlgCreateVolumeGroup( list vgm_list ); void new_vg_list( list vg_list ); integer pesize_str_to_byte( string input ); -list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap, boolean view_all_mnts, - string current_vg ); list get_lv_size_info( map<string,map> targetMap, string current_vg ); void signature_dummy() ``{ return; } -- 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] r49579 - /tags/stable-2_17_1/repair/
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:22:50 2008 New Revision: 49579 URL: http://svn.opensuse.org/viewcvs/yast?rev=49579&view=rev Log: Created tag stable-2_17_1 for repair Added: tags/stable-2_17_1/repair/ - copied from r49578, trunk/repair/ -- 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] r49578 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRPtbl.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:20:36 2008 New Revision: 49578 URL: http://svn.opensuse.org/viewcvs/yast?rev=49578&view=rev Log: - use String::FormatSize Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRPtbl.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=49578&r1=4957… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Fri Aug 1 15:20:36 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Fri Aug 1 15:20:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 01 15:19:50 CEST 2008 - aschnell(a)suse.de + +- use String::FormatSize +- 2.17.1 + +------------------------------------------------------------------- Mon Jun 9 11:49:03 CEST 2008 - jsuchome(a)suse.cz - use ReplaceWidget instead of changing button label (bnc#393832) Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=49578… ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Fri Aug 1 15:20:36 2008 @@ -25,11 +25,10 @@ import "StorageDevices"; import "Mode"; import "Report"; - + import "String"; import "Label"; import "Popup"; - include "partitioning/partition_defines.ycp"; textdomain "repair"; @@ -338,7 +337,7 @@ n["fsid"]:131, sformat ("%1", n["region",0]:0), sformat ("%1", n["region",1]:0 + n["region",0]:0 - 1), - ByteToHumanString (n["size_k"]:0 * 1024) + String::FormatSize (n["size_k"]:0 * 1024) )); } }); @@ -834,7 +833,7 @@ // partition info 2/3, %1 is partition ID (number) sformat(_("ID %1, "), part["fsid"]:131) + // partition info 3/3, %1 is partition size (number) - sformat (_("Size %1"), ByteToHumanString ( + sformat (_("Size %1"), String::FormatSize ( part["region",1]:0 * maindev["cyl_size"]:0)); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0