July 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62188 - in /trunk/gtk: ChangeLog src/pkg/ygtkpkgmenubar.cc
by rpmcruz＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rpmcruz Date: Tue Jul 6 19:31:46 2010 New Revision: 62188 URL: http://svn.opensuse.org/viewcvs/yast?rev=62188&view=rev Log: * src/pkg/ygtkpkgmenubar.cc: bug fix 609778 (in part): only present online-update configuration when on online-update. Conversely for webpin-search. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgmenubar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62188&r1=62187… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Jul 6 19:31:46 2010 @@ -1,3 +1,9 @@ +2010-07-05 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgmenubar.cc: bug fix 609778 (in part): + only present online-update configuration when on + online-update. Conversely for webpin-search. + 2010-07-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGDialog.cc: bug fix 618951: sw_single too Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Tue Jul 6 19:31:46 2010 @@ -703,10 +703,12 @@ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); append_menu_item (submenu, _("Repositories..."), NULL, G_CALLBACK (repoManager), this); - append_menu_item (submenu, _("Online Update..."), NULL, - G_CALLBACK (onlineUpdateConfiguration), this); - append_menu_item (submenu, _("Search Packages on Web..."), NULL, - G_CALLBACK (webpinSearch), this); + if (selector->onlineUpdateMode()) + append_menu_item (submenu, _("Online Update..."), NULL, + G_CALLBACK (onlineUpdateConfiguration), this); + else + append_menu_item (submenu, _("Search Packages on Web..."), NULL, + G_CALLBACK (webpinSearch), this); } item = append_menu_item (menu_bar, _("Dependencies"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); -- 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] r62187 - in /trunk/storage/storage/src/testsuite: data/ data/empty-efi/ tests/
by aschnell＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: aschnell Date: Tue Jul 6 15:37:48 2010 New Revision: 62187 URL: http://svn.opensuse.org/viewcvs/yast?rev=62187&view=rev Log: - added efi testcases Added: trunk/storage/storage/src/testsuite/data/empty-efi/ (with props) trunk/storage/storage/src/testsuite/data/empty-efi/Makefile.am trunk/storage/storage/src/testsuite/data/empty-efi/arch.info trunk/storage/storage/src/testsuite/data/empty-efi/disk_sda.info trunk/storage/storage/src/testsuite/tests/empty-efi1.err trunk/storage/storage/src/testsuite/tests/empty-efi1.out trunk/storage/storage/src/testsuite/tests/empty-efi1.ycp trunk/storage/storage/src/testsuite/tests/empty-efi2.err trunk/storage/storage/src/testsuite/tests/empty-efi2.out trunk/storage/storage/src/testsuite/tests/empty-efi2.ycp Modified: trunk/storage/storage/src/testsuite/data/Makefile.am Modified: trunk/storage/storage/src/testsuite/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/Makefile.am Tue Jul 6 15:37:48 2010 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data # -SUBDIRS = empty half-empty reuse-home windows windows-only +SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only Added: trunk/storage/storage/src/testsuite/data/empty-efi/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/empty-efi/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/empty-efi/Makefile.am Tue Jul 6 15:37:48 2010 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/empty-efi +# + +EXTRA_DIST = disk_sda.info arch.info + Added: trunk/storage/storage/src/testsuite/data/empty-efi/arch.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/empty-efi/arch.info (added) +++ trunk/storage/storage/src/testsuite/data/empty-efi/arch.info Tue Jul 6 15:37:48 2010 @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<arch> + <arch>x86_64</arch> + <efiboot>true</efiboot> +</arch> Added: trunk/storage/storage/src/testsuite/data/empty-efi/disk_sda.info URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/empty-efi/disk_sda.info (added) +++ trunk/storage/storage/src/testsuite/data/empty-efi/disk_sda.info Tue Jul 6 15:37:48 2010 @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>312571224</size_k> + <major>8</major> + <minor>64</minor> + <range>256</range> + <cylinder>38913</cylinder> + <head>255</head> + <sector>63</sector> + <label>gpt</label> + <max_primary>128</max_primary> +</disk> Added: trunk/storage/storage/src/testsuite/tests/empty-efi1.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/empty-efi1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi1.out (added) +++ trunk/storage/storage/src/testsuite/tests/empty-efi1.out Tue Jul 6 15:37:48 2010 @@ -0,0 +1,4 @@ +Dump Proposal: +Dump Create boot volume /dev/sda1 (70.60 MB) with vfat +Dump Create swap volume /dev/sda2 (517.72 MB) +Dump Create root volume /dev/sda3 (297.51 GB) with ext4 Added: trunk/storage/storage/src/testsuite/tests/empty-efi1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi1.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/empty-efi1.ycp Tue Jul 6 15:37:48 2010 @@ -0,0 +1,17 @@ +// testedfiles: helper1b.yh +{ + include "./tests/setup-system.yh"; + + setup_system("empty-efi"); + + include "./tests/helper1a.yh"; + + import "ProductFeatures"; + + ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", false); + ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false); + ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); + ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); + + include "./tests/helper1b.yh"; +} Added: trunk/storage/storage/src/testsuite/tests/empty-efi2.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/empty-efi2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi2.out (added) +++ trunk/storage/storage/src/testsuite/tests/empty-efi2.out Tue Jul 6 15:37:48 2010 @@ -0,0 +1,5 @@ +Dump Proposal: +Dump Create boot volume /dev/sda1 (70.60 MB) with vfat +Dump Create swap volume /dev/sda2 (2.01 GB) +Dump Create root volume /dev/sda3 (20.00 GB) with ext4 +Dump Create volume /dev/sda4 (276.01 GB) for /home with ext4 Added: trunk/storage/storage/src/testsuite/tests/empty-efi2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi2.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/empty-efi2.ycp Tue Jul 6 15:37:48 2010 @@ -0,0 +1,17 @@ +// testedfiles: helper1b.yh +{ + include "./tests/setup-system.yh"; + + setup_system("empty-efi"); + + include "./tests/helper1a.yh"; + + import "ProductFeatures"; + + ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true); + ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false); + ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB"); + ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB"); + + include "./tests/helper1b.yh"; +} -- 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] r62186 - /trunk/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rhafer Date: Tue Jul 6 14:32:15 2010 New Revision: 62186 URL: http://svn.opensuse.org/viewcvs/yast?rev=62186&view=rev Log: updated changelog Modified: trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Tue Jul 6 14:32:15 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 6 12:30:23 UTC 2010 - rhafer(a)novell.com + +- Write tls_cacert option to ldap.conf (bnc#619549) +- Rename ReadInitialDefaults() back to CreateInitialDefaults() + to stay backwards compatible. (bnc#615805) + +------------------------------------------------------------------- Fri Apr 16 09:27:08 UTC 2010 - rhafer(a)novell.com - Version 2.19.0 -- 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] r62185 - in /branches/SuSE-Linux-11_3-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rhafer Date: Tue Jul 6 14:30:01 2010 New Revision: 62185 URL: http://svn.opensuse.org/viewcvs/yast?rev=62185&view=rev Log: Preparing 2.19.1 Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/VERSION branches/SuSE-Linux-11_3-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/VERSION Tue Jul 6 14:30:01 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/package/yast2-ldap-server.changes Tue Jul 6 14:30:01 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 6 11:29:07 UTC 2010 - rhafer(a)novell.com + +- Version 2.19.1 + * Write tls_cacert option to ldap.conf (bnc#619549) + * Rename ReadInitialDefaults() back to CreateInitialDefaults() + to stay backwards compatible. (bnc#615805) + +------------------------------------------------------------------- Fri Apr 16 09:27:08 UTC 2010 - rhafer(a)novell.com - Version 2.19.0 -- 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] r62184 - in /branches/SuSE-Linux-11_3-Branch/ldap-server: ./ src/LdapDatabase.ycp src/LdapServer.pm src/dialogs.ycp src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rhafer Date: Tue Jul 6 13:28:21 2010 New Revision: 62184 URL: http://svn.opensuse.org/viewcvs/yast?rev=62184&view=rev Log: Fixes for bnc#619549 and bnc#615805 from trunk Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/ (props changed) branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp Tue Jul 6 13:28:21 2010 @@ -148,7 +148,7 @@ boolean append_checked = true; if ( createDefaults ) { - db = LdapServer::ReadInitialDefaults(); + db = LdapServer::CreateInitialDefaults(); } else { Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm Tue Jul 6 13:28:21 2010 @@ -811,6 +811,13 @@ ["localhost"]); SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base", [$ldapconf_base]); + my $tls = $self->ReadTlsConfig(); + if ( ref($tls) eq "HASH" && $tls->{'caCertFile'} ne "" ) + { + SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".tls_cacert", + [$tls->{'caCertFile'}]); + } + SCR->Write(".etc.ldap_conf", "force" ); } if (! $usesBackConfig ) { @@ -1570,10 +1577,10 @@ # # @return A Map containing the setting to use when creating the initial setup # -BEGIN { $TYPEINFO {ReadInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub ReadInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("ReadInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -1759,6 +1766,7 @@ $self->ChangeDatabaseIndex(1, $idx ); } } + $self->WriteLdapConfBase($database->{'suffix'}); if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) { Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp Tue Jul 6 13:28:21 2010 @@ -206,7 +206,7 @@ any EnableServiceDialog() { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], "display_details": true, @@ -1075,7 +1075,7 @@ } else { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); defaults["configpw"] = pw; LdapServer::SetInitialDefaults(defaults); break; Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Jul 6 13:28:21 2010 @@ -73,7 +73,7 @@ { LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); @@ -86,7 +86,7 @@ if( LdapServer::ReadServiceEnabled() ) { string rootPWString = ""; - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); if (! LdapServer::ReadSetupSlave() ) { if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) @@ -250,7 +250,7 @@ } } LdapServer::ReadFromDefaults(); - map <string,any> defaults = LdapServer::ReadInitialDefaults(); + map <string,any> defaults = LdapServer::CreateInitialDefaults(); Progress::set(false); Ldap::Read(); Progress::set(true); -- 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] r62183 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm dialogs.ycp ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rhafer Date: Tue Jul 6 12:14:31 2010 New Revision: 62183 URL: http://svn.opensuse.org/viewcvs/yast?rev=62183&view=rev Log: - Write CA cert option to ldap.conf (bnc#619549) - Rename ReadInitialDefaults() back to CreateInitialDefaults() to stay backwards compatible. (bnc#615805) Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Tue Jul 6 12:14:31 2010 @@ -148,7 +148,7 @@ boolean append_checked = true; if ( createDefaults ) { - db = LdapServer::ReadInitialDefaults(); + db = LdapServer::CreateInitialDefaults(); } else { 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 Tue Jul 6 12:14:31 2010 @@ -811,6 +811,13 @@ ["localhost"]); SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base", [$ldapconf_base]); + my $tls = $self->ReadTlsConfig(); + if ( ref($tls) eq "HASH" && $tls->{'caCertFile'} ne "" ) + { + SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".tls_cacert", + [$tls->{'caCertFile'}]); + } + SCR->Write(".etc.ldap_conf", "force" ); } if (! $usesBackConfig ) { @@ -1570,10 +1577,10 @@ # # @return A Map containing the setting to use when creating the initial setup # -BEGIN { $TYPEINFO {ReadInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub ReadInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("ReadInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -1759,6 +1766,7 @@ $self->ChangeDatabaseIndex(1, $idx ); } } + $self->WriteLdapConfBase($database->{'suffix'}); if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) { Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Tue Jul 6 12:14:31 2010 @@ -206,7 +206,7 @@ any EnableServiceDialog() { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], "display_details": true, @@ -1079,7 +1079,7 @@ } else { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); defaults["configpw"] = pw; LdapServer::SetInitialDefaults(defaults); break; Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Tue Jul 6 12:14:31 2010 @@ -73,7 +73,7 @@ { LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); @@ -86,7 +86,7 @@ if( LdapServer::ReadServiceEnabled() ) { string rootPWString = ""; - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); if (! LdapServer::ReadSetupSlave() ) { if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) @@ -250,7 +250,7 @@ } } LdapServer::ReadFromDefaults(); - map <string,any> defaults = LdapServer::ReadInitialDefaults(); + map <string,any> defaults = LdapServer::CreateInitialDefaults(); Progress::set(false); Ldap::Read(); Progress::set(true); -- 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] r62182 - in /branches/SuSE-Linux-11_3-Branch/ldap-server/src: LdapDatabase.ycp dialogs.ycp helps.ycp tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 06 Jul '10

06 Jul '10

Author: rhafer Date: Tue Jul 6 12:09:20 2010 New Revision: 62182 URL: http://svn.opensuse.org/viewcvs/yast?rev=62182&view=rev Log: revert r62150-r62152, they didn't endup in 11.3 Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp Tue Jul 6 12:09:20 2010 @@ -855,12 +855,10 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `Left( - `HBox( - `PushButton( `id (`pb_add ), Label::AddButton() ), - `PushButton( `id (`pb_edit ), Label::EditButton() ), - `PushButton( `id (`pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id (`pb_add ), _("Add") ), + `PushButton( `id (`pb_del ), _("Delete") ), + `PushButton( `id (`pb_edit ), _("Edit") ) ) ) ), @@ -1149,12 +1147,10 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `Left( - `HBox( - `PushButton( `id (`pb_add ), Label::AddButton() ), - `PushButton( `id (`pb_edit ),Label::EditButton() ), - `PushButton( `id (`pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id (`pb_add ), _("Add") ), + `PushButton( `id (`pb_del ), _("Delete") ), + `PushButton( `id (`pb_edit ), _("Edit") ) ) ) ); Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp Tue Jul 6 12:09:20 2010 @@ -282,37 +282,33 @@ term serverTypeWidget = `HSquash( `VBox( - `Heading( _("Server type") ), - `Frame("", + `Heading( _("Please select Server type") ), + `VSpacing(), + `RadioButtonGroup( + `id( `rbg_servertype ), `VBox( + `Left( + `RadioButton( + `id( `rb_standalone ), + _("This will be a standalone server"), + true + ) + ), `VSpacing(), - `RadioButtonGroup( - `id( `rbg_servertype ), - `VBox( - `Left( - `RadioButton( - `id( `rb_standalone ), - _("Stand-alone server"), - true - ) - ), - `VSpacing(), - `Left( - `RadioButton( - `id( `rb_master ), - _("Master server in a replication setup"), - false - ) - ), - `VSpacing(), - `Left( - `RadioButton( - `id( `rb_slave ), - _("Replica (slave) server.\n") + - _("All data, including configuration, is replicated from a remote server."), - false - ) - ) + `Left( + `RadioButton( + `id( `rb_master ), + _("This server can act as a master server in a replication setup"), + false + ) + ), + `VSpacing(), + `Left( + `RadioButton( + `id( `rb_slave ), + _("This will be a replica (slave) server.\n") + + _("All data including configuration will replicated from a remote server."), + false ) ) ) Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/helps.ycp Tue Jul 6 12:09:20 2010 @@ -218,11 +218,11 @@ /* Configuration Wizard Step 2 */ "server_type" : _("Select the type of LDAP Server you want to setup. The following scenarios are available:") + - _("Stand-alone server: Setup a single standalone OpenLDAP Server with no preparations for + _("Standalone Server: Setup a single standalone OpenLDAP Server with no preparations for replication") + - _("Master server in a replication setup: Create an OpenLDAP setup that is prepared to act as a master server + _("Replication Master (Provider): Create an OpenLDAP setup that is prepared to act as a master server (provider) in a replication setup.") + - _("Replica slave server: Setup an OpenLDAP slave server that replicates all its data, + _("Replication Slave (Consumer): Setup an OpenLDAP slave server that replicates all its data, including configuration, from a master server."), /* Configuration Wizard Step 3 */ Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/tree_structure.ycp Tue Jul 6 12:09:20 2010 @@ -1192,11 +1192,9 @@ `MinSize( 60, 7, `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) ) ), - `Left( - `HBox( - `PushButton( `id( `pb_add ), Label::AddButton() ), - `PushButton( `id( `pb_del ), Label::DeleteButton() ) - ) + `HBox( + `PushButton( `id( `pb_add ), _("A&dd Database...") ), + `PushButton( `id( `pb_del ), _("Delete Database") ) ) ), "cb_read" : ``( cb_read_databases() ), Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-s… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/widgets.ycp Tue Jul 6 12:09:20 2010 @@ -301,13 +301,11 @@ `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")), [ ] ), - `Left( - `HSquash( - `HBox( - `PushButton( `id( `pb_idx_add ), Label::AddButton() ), - `PushButton( `id( `pb_idx_edit ), Label::EditButton() ), - `PushButton( `id( `pb_idx_del ), Label::DeleteButton() ) - ) + `HSquash( + `HBox( + `PushButton( `id( `pb_idx_add ), _("Add") ), + `PushButton( `id( `pb_idx_edit ), _("Edit") ), + `PushButton( `id( `pb_idx_del ), _("Delete") ) ) ) ); -- 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] r62181 - in /trunk/storage: ./ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 05 Jul '10

05 Jul '10

Author: aschnell Date: Mon Jul 5 15:21:08 2010 New Revision: 62181 URL: http://svn.opensuse.org/viewcvs/yast?rev=62181&view=rev Log: - moved EFI detection from YCP to C++ (bnc #612867) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in 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 Jul 5 15:21:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 05 15:13:18 CEST 2010 - aschnell(a)suse.de + +- moved EFI detection from YCP to C++ (bnc #612867) +- 2.20.0 + +------------------------------------------------------------------- Mon Jun 21 16:42:34 CEST 2010 - aschnell(a)suse.de - avoid unreadable buttons (bnc #615377) 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 Jul 5 15:21:08 2010 @@ -472,7 +472,7 @@ { not_used_mp = filter( string mp, not_used_mp, - ``(!contains( FileSystems::system_m_points, mp))); + ``(!contains(FileSystems::system_m_points(), mp))); } if(mount == "swap") new["mount"] = ""; Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Jul 5 15:21:08 2010 @@ -63,8 +63,8 @@ global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; - global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; - global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ]; + global list<string> system_m_points() { return [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; } + global list<string> crypt_m_points() { return [ "/", Partitions::BootMount(), "/usr" ]; } global const list<string> swap_m_points = [ "swap" ]; global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ]; @@ -79,7 +79,7 @@ { suggest_m_points = [ "/home", "/srv", "/tmp", "/local" ]; if( Stage::initial() ) - suggest_m_points = (list<string>)union( system_m_points, + suggest_m_points = (list<string>)union( system_m_points(), suggest_m_points ); y2milestone( "SuggestMPoints init:%1", suggest_m_points ); } @@ -1149,10 +1149,10 @@ global define boolean IsCryptMp( string mount, boolean prefix ) ``{ - boolean ret = contains( crypt_m_points, mount ); + boolean ret = contains( crypt_m_points(), mount ); if( !ret && prefix ) { - list<string> mp = filter(string s, system_m_points, ``(s!="/") ); + list<string> mp = filter(string s, system_m_points(), ``(s!="/") ); foreach(string s, mp, ``{ ret = ret || search( mount, s + "/" )==0; @@ -1164,10 +1164,10 @@ global define boolean IsSystemMp( string mount, boolean prefix ) ``{ - boolean ret = contains( system_m_points, mount ); + boolean ret = contains( system_m_points(), mount ); if( !ret && prefix ) { - list<string> mp = filter(string s, system_m_points, ``(s!="/") ); + list<string> mp = filter(string s, system_m_points(), ``(s!="/") ); foreach(string s, mp, ``{ ret = ret || search( mount, s + "/" )==0; Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Jul 5 15:21:08 2010 @@ -101,30 +101,7 @@ global boolean EfiBoot() { - // TODO: move to libstorage - - boolean ret = false; - - if (Arch::ia64()) - { - ret = true; - } - else - { - if (Stage::initial()) - { - string tmp = (string) SCR::Read(.etc.install_inf.EFI); - if (tmp != nil && tmp == "1") - ret = true; - } - else - { - string tmp = (string) SCR::Read(.sysconfig.bootloader.LOADER_TYPE); - if (tmp != nil && tmp == "elilo") - ret = true; - } - } - + boolean ret = LibStorage::StorageInterface::getEfiBoot(sint); y2milestone("EfiBoot ret:%1", ret); return ret; } 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 Mon Jul 5 15:21:08 2010 @@ -322,8 +322,6 @@ LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); } - LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot()); - conts = getContainers(); y2milestone("InitLibstorage conts:%1", conts); FileSystems::InitSlib(sint); Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Jul 5 15:21:08 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.15 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.20.0 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings perl = %{perl_version} -- 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] r62180 - /trunk/storage/VERSION
by aschnell＠svn.opensuse.org 05 Jul '10

05 Jul '10

Author: aschnell Date: Mon Jul 5 14:37:12 2010 New Revision: 62180 URL: http://svn.opensuse.org/viewcvs/yast?rev=62180&view=rev Log: - increased version Modified: trunk/storage/VERSION Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=62180&r1=621… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Jul 5 14:37:12 2010 @@ -1 +1 @@ -2.19.15 +2.20.0 -- 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] r62179 - /branches/SuSE-Linux-11_3-Branch/
by aschnell＠svn.opensuse.org 05 Jul '10

05 Jul '10

Author: aschnell Date: Mon Jul 5 14:32:17 2010 New Revision: 62179 URL: http://svn.opensuse.org/viewcvs/yast?rev=62179&view=rev Log: - created maintenance branch for openSUSE 11.3 Added: branches/SuSE-Linux-11_3-Branch/ - copied from r62178, trunk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0