February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63445 - in /trunk/firstboot: VERSION doc/firstboot-section_mod.xml package/yast2-firstboot.changes scripts/Firstboot-Stage/S09-cleanup
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:31:20 2011 New Revision: 63445 URL: http://svn.opensuse.org/viewcvs/yast?rev=63445&view=rev Log: - call stop_unicode before kbd restart (bnc#665504) - docu update - 2.20.2 Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=63445&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Fri Feb 18 11:31:20 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_… ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Fri Feb 18 11:31:20 2011 @@ -148,7 +148,7 @@ <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_congratulate. The content of the given file would be shown as the final text. - However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). + However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). With such text, it is possible to provide translations to more languages, which is not possible for FIRSTBOOT_FINISH_FILE. </para> </section> Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Fri Feb 18 11:31:20 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 18 11:28:57 CET 2011 - jsuchome(a)suse.cz + +- call stop_unicode before kbd restart (bnc#665504) +- docu update +- 2.20.2 + +------------------------------------------------------------------- Wed Nov 3 17:11:19 CET 2010 - jsuchome(a)suse.cz - translate bootloader items after setting the language (bnc#644062) Modified: trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Fri Feb 18 11:31:20 2011 @@ -42,13 +42,13 @@ rm -f $IFCFG_USB fi +stop_unicode + if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then /etc/init.d/kbd restart rm /var/lib/YaST2/firstboot_kbd_restart fi -stop_unicode - if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then log "\tRebooting system as requested by firstboot..." rm /var/lib/YaST2/firstboot_reboot_after_finish -- 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] r63444 - /tags/branch-Code-11-SP1-2_17_16_1/firstboot/
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:28:51 2011 New Revision: 63444 URL: http://svn.opensuse.org/viewcvs/yast?rev=63444&view=rev Log: Created tag branch-Code-11-SP1-2_17_16_1 for firstboot Added: tags/branch-Code-11-SP1-2_17_16_1/firstboot/ (props changed) - copied from r63443, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- 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] r63443 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes scripts/Firstboot-Stage/S09-cleanup
by jsuchome＠svn2.opensuse.org 18 Feb '11

18 Feb '11

Author: jsuchome Date: Fri Feb 18 11:28:04 2011 New Revision: 63443 URL: http://svn.opensuse.org/viewcvs/yast?rev=63443&view=rev Log: - call stop_unicode before kbd restart (bnc#665504) - 2.17.16.1 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Fri Feb 18 11:28:04 2011 @@ -1 +1 @@ -2.17.16 +2.17.16.1 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Fri Feb 18 11:28:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 10 17:05:04 CET 2011 - jsuchome(a)suse.cz + +- call stop_unicode before kbd restart (bnc#665504) +- 2.17.16.1 + +------------------------------------------------------------------- Wed Oct 27 09:51:32 CEST 2010 - jsuchome(a)suse.cz - translate bootloader items after setting the language (bnc#644062) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup Fri Feb 18 11:28:04 2011 @@ -42,13 +42,13 @@ rm -f $IFCFG_USB fi +stop_unicode + if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then /etc/init.d/kbd restart rm /var/lib/YaST2/firstboot_kbd_restart fi -stop_unicode - if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then log "\tRebooting system as requested by firstboot..." rm /var/lib/YaST2/firstboot_reboot_after_finish -- 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] r63442 - /tags/branch-SLE-10-SP4-2_13_141/network/
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 17:07:21 2011 New Revision: 63442 URL: http://svn.opensuse.org/viewcvs/yast?rev=63442&view=rev Log: Created tag branch-SLE-10-SP4-2_13_141 for network Added: tags/branch-SLE-10-SP4-2_13_141/network/ - copied from r63441, branches/SuSE-SLE-10-SP4-Branch/network/ -- 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] r63441 - /tags/branch-SLE-10-SP4-2_13_141/
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 17:07:19 2011 New Revision: 63441 URL: http://svn.opensuse.org/viewcvs/yast?rev=63441&view=rev Log: Created tag branch-SLE-10-SP4-2_13_141 Added: tags/branch-SLE-10-SP4-2_13_141/ -- 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] r63440 - in /branches/SuSE-SLE-10-SP4-Branch/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mvidner＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: mvidner Date: Thu Feb 17 16:28:45 2011 New Revision: 63440 URL: http://svn.opensuse.org/viewcvs/yast?rev=63440&view=rev Log: Fixed losing nameservers when doing a DVD installation (bnc#668034). r60729 which intended to fix bnc#561349 claims "write resolv.conf when change from dhcp->static" but in fact writes it always, even if there was no config at all, overwriting the DHCP nameservers with an empty list. Deleted that bit, bringing the patch closer to the original one of which it was a "backport", r41079 bnc#327074. Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/VERSION Thu Feb 17 16:28:45 2011 @@ -1 +1 @@ -2.13.140 +2.13.141 Modified: branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/package/yast2-network.changes Thu Feb 17 16:28:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 16:27:51 CET 2011 - mvidner(a)suse.cz + +- Fixed losing nameservers when doing a DVD installation (bnc#668034). +- 2.13.141 + +------------------------------------------------------------------- Tue Feb 1 13:05:46 CET 2011 - mvidner(a)suse.cz - Dropped ag_xauth (.xauth.key), superseded since 2005 by Modified: branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/network/src/modules/Lan.ycp Thu Feb 17 16:28:45 2011 @@ -585,9 +585,6 @@ y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); NetworkService::StartStop (); y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); - DNS::modified=true; - DNS::Write(); - y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); sleep(sl); } -- 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] r63439 - in /trunk/storage: package/ storage/src/ storage/src/include/ storage/src/modules/ storage/src/testsuite/
by fehr＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: fehr Date: Thu Feb 17 15:49:12 2011 New Revision: 63439 URL: http://svn.opensuse.org/viewcvs/yast?rev=63439&view=rev Log: add option to demand and proposal using btrfs as default filesystem Added: trunk/storage/storage/src/testsuite/.cvsignore Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/inst_disk_proposal.ycp trunk/storage/storage/src/inst_target_part.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Feb 17 15:49:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 15:47:57 CET 2011 - fehr(a)suse.de + +- add option to demand and proposal using btrfs as default + filesystem + +------------------------------------------------------------------- Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de - add button to trigger query for crypt password (bnc #666883) 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 Thu Feb 17 15:49:12 2011 @@ -70,74 +70,6 @@ } - boolean QueryProposalPassword() - { - if (!isempty(StorageProposal::GetProposalPassword())) - return true; - - UI::OpenDialog(`VBox( - `Label(_("Enter your password for the proposal encryption.")), - `MinWidth(40, - `Password(`id(`pw1), - // Label: get password for user root - // Please use newline if label is longer than 40 characters - _("Password:"), "")), - `VSpacing(0.5), - `MinWidth(40, - `Password(`id(`pw2), - // Label: get same password again for verification - // Please use newline if label is longer than 40 characters - _("Reenter the password for verification:"), "")), - `Label(_("Don't forget what you enter here!")), - `ButtonBox( - `PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton()) - ) - )); - - string password = ""; - symbol widget = nil; - - repeat - { - // Clear password fields on every round. - UI::ChangeWidget(`id(`pw1), `Value, ""); - UI::ChangeWidget(`id(`pw2), `Value, ""); - - UI::SetFocus(`id(`pw1)); - - widget = (symbol) UI::UserInput(); - - switch (widget) - { - case `ok: - - password = (string) UI::QueryWidget(`id(`pw1), `Value); - string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); - - if (!Storage::CheckEncryptionPasswords(password, tmp, 8, false)) - widget = `again; - - break; - } - - } until (widget == `cancel || widget == `ok); - - UI::CloseDialog(); - - if (widget == `ok) - { - StorageProposal::SetProposalPassword(password); - return true; - } - else - { - return false; - } - - } - - ////////////////////////////////////////////////////////////////////////////// // Dialog Password for Crypted FS Update ////////////////////////////////////////////////////////////////////////////// Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_pr… ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Thu Feb 17 15:49:12 2011 @@ -141,12 +141,6 @@ string detailed_str = _("&Create Partition Setup..."); // Radiobutton for partition dialog string import_str = _("&Import Partition Setup..."); -// Radiobutton for partition dialog -string part_str = _("&Partition Based"); -// Radiobutton for partition dialog -string lvm_str = _("&LVM Based"); -// Checkbox for partition dialog -string encrypt_str = _("Encrypt Volume Group"); string target_is = ""; @@ -185,18 +179,10 @@ y2milestone( "current proposal: %1", changes ); -term rframe = - `HBox( - `HSpacing(3), - `Top(`MinWidth(20, `Left(`RadioButton(`id(`part), `opt(`notify), part_str, - !StorageProposal::GetProposalLvm())))), - `HSpacing(3), - `Top(`MinWidth(20, `VBox(`Left(`RadioButton(`id(`lvm), `opt(`notify), lvm_str, - StorageProposal::GetProposalLvm())), - `Left(`HBox(`HSpacing(4), `CheckBox(`id(`encrypt), `opt(`notify), encrypt_str, - StorageProposal::GetProposalEncrypt())))))), - `HSpacing(3) - ); +term rframe = + `HBox( `HSpacing(20), + StorageProposal::AddCommonWidgets(), + `HSpacing(3) ); term bframe = `VBox( @@ -215,8 +201,7 @@ `HSpacing(2), `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), - `VSpacing(1), - `RadioButtonGroup( `id("prop_mode"), rframe ), + rframe, `VSpacing(2), bframe, `VStretch() @@ -282,8 +267,7 @@ repeat { - symbol old_mode = (symbol) UI::QueryWidget(`id("prop_mode"), `CurrentButton); - y2milestone( "old_mode %1", old_mode ); + boolean val = false; Wizard::SetFocusToNextButton(); ret = (symbol)Wizard::UserInput(); y2milestone( "USERINPUT %1", ret ); @@ -291,45 +275,13 @@ if( ret == `abort && Popup::ReallyAbort(true) ) return `abort; - if( contains( [ `lvm, `part, `encrypt ], ret ) ) + if( contains( [ `lvm, `home, `btrfs, `encrypt ], ret ) ) { + val = (boolean) UI::QueryWidget(`id(ret), `Value); if( AskOverwriteChanges() ) { target_is = "SUGGESTION"; - - switch (ret) - { - case `part: - StorageProposal::SetProposalLvm(false); - UI::ChangeWidget(`id(`encrypt), `Enabled, false); - break; - - case `lvm: - StorageProposal::SetProposalLvm(true); - UI::ChangeWidget(`id(`encrypt), `Enabled, true); - break; - - case `encrypt: - - if ((boolean) UI::QueryWidget(`id(`encrypt), `Value)) - { - if (QueryProposalPassword()) - { - StorageProposal::SetProposalEncrypt(true); - } - else - { - UI::ChangeWidget(`id(`encrypt), `Value, false); - continue; - } - } - else - { - StorageProposal::SetProposalEncrypt(false); - } - break; - } - + StorageProposal::HandleCommonWidgets( ret ); Storage::ResetOndiskTarget(); Storage::AddMountPointsForWin(Storage::GetTargetMap()); map prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); @@ -350,9 +302,7 @@ UI::ChangeWidget(`id(`richtext), `Value, changes); } else - { - UI::ChangeWidget( `id("prop_mode"), `CurrentButton, old_mode ); - } + UI::ChangeWidget(`id(ret), `Value, !val); } else if (contains([ `modify, `detailed, `import ], ret)) { @@ -395,13 +345,15 @@ execSubscreens( ret ); changes = Storage::ChangeText(); UI::ChangeWidget(`id(`richtext), `Value, changes); - if( ret==`detailed ) - { - UI::ChangeWidget(`id(`part), `Value, !StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`lvm), `Value, StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`encrypt), `Enabled, StorageProposal::GetProposalLvm()); - UI::ChangeWidget(`id(`encrypt), `Value, StorageProposal::GetProposalEncrypt()); - } + val = StorageProposal::GetProposalLvm(); + UI::ChangeWidget(`id(`lvm), `Value, val ); + UI::ChangeWidget(`id(`encrypt), `Enabled, val ); + UI::ChangeWidget( `id(`encrypt), `Value, + val && StorageProposal::GetProposalEncrypt() ); + UI::ChangeWidget(`id(`home), `Value, + StorageProposal::GetProposalHome() ); + UI::ChangeWidget(`id(`btrfs), `Value, + StorageProposal::GetProposalBtrfs() ); } } until ( ret == `next || ret == `back || ret == `cancel ); Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_… ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Thu Feb 17 15:49:12 2011 @@ -17,6 +17,7 @@ import "Mode"; import "Popup"; import "Storage"; + import "StorageProposal"; import "Partitions"; import "Product"; import "Label"; @@ -160,7 +161,7 @@ // this is the resize case // vbox = create_resize_dialog (partitions, target["cyl_size"]:1 ); - vbox = add_common_widgets( vbox ); + vbox = add( vbox, StorageProposal::AddCommonWidgets()); y2milestone ("can resize !"); } else @@ -170,7 +171,7 @@ map tmp = construct_partition_dialog( partitions, target["label"]:"", target["cyl_size"]:1 ); - vbox = add_common_widgets( tmp["term"]:`Empty() ); + vbox = add( tmp["term"]:`VBox(), StorageProposal::AddCommonWidgets()); } } @@ -179,7 +180,7 @@ else { vbox = create_whole_disk_dialog(); - vbox = add_common_widgets( vbox ); + vbox = add( vbox, StorageProposal::AddCommonWidgets()); } // Since resize case and normal case have different help texts we need @@ -220,18 +221,10 @@ { break; } - else if (ret == `lvm) - { - UI::ChangeWidget(`id(`encrypt), `Enabled, (boolean) UI::QueryWidget(`id(`lvm), `Value)); - } - else if (ret == `encrypt) - { - if ((boolean) UI::QueryWidget(`id(`encrypt), `Value)) + else if( contains( [ `lvm, `home, `btrfs, `encrypt ], ret ) ) { - if (!QueryProposalPassword()) - UI::ChangeWidget(`id(`encrypt), `Value, false); - } - } + StorageProposal::HandleCommonWidgets(ret); + } else if (ret == `full) { // Set all checkboxes @@ -396,12 +389,7 @@ y2milestone ("partitions '%1'", partitions); - StorageProposal::SetProposalHome( (boolean)UI::QueryWidget( `id(`home), `Value )); - StorageProposal::SetProposalLvm((boolean) UI::QueryWidget(`id(`lvm), `Value)); - StorageProposal::SetProposalEncrypt((boolean) UI::QueryWidget(`id(`encrypt), `Value)); - ok = create_partitions( targetMap, target, partitions ); - StorageProposal::SetProposalDefault(true); if( !ok ) { string reason = _("Too few partitions are marked for removal 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 Thu Feb 17 15:49:12 2011 @@ -131,7 +131,11 @@ { if (default_boot_fs == `unknown) { - default_boot_fs = DefaultFs(); + + if( DefaultFs()!=`btrfs ) + default_boot_fs = DefaultFs(); + else + default_boot_fs = `ext4; if (EfiBoot()) { default_boot_fs = `vfat; Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Thu Feb 17 15:49:12 2011 @@ -19,6 +19,7 @@ import "FileSystems"; import "Partitions"; + import "Label"; import "Storage"; import "ProductFeatures"; import "Arch"; @@ -49,6 +50,7 @@ boolean proposal_home = false; boolean proposal_lvm = false; boolean proposal_encrypt = false; + boolean proposal_btrfs = false; string proposal_password = ""; map<string, any> cfg_xml = $[]; @@ -87,6 +89,17 @@ y2milestone("SetProposalEncrypt val:%1", val); } + global boolean GetProposalBtrfs() + { + return proposal_btrfs; + } + + global void SetProposalBtrfs(boolean val) + { + proposal_btrfs = val; + y2milestone("SetProposalBtrfs val:%1", val); + } + global string GetProposalPassword() { return proposal_password; @@ -107,8 +120,10 @@ SetProposalEncrypt(false); SetProposalPassword(""); } - y2milestone("SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4", proposal_home, - proposal_lvm, proposal_encrypt, home_only); + SetProposalBtrfs(cfg_xml["btrfs"]:false); + y2milestone("SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4 btrfs:%5", + proposal_home, proposal_lvm, proposal_encrypt, home_only, + proposal_btrfs); } @@ -162,7 +177,6 @@ return cfg_xml; } - global string GetProposalVM() { string ret = ""; @@ -174,6 +188,14 @@ return ret; } +symbol PropDefaultFs() + { + symbol ret = Partitions::DefaultFs(); + if( GetProposalBtrfs() ) + ret = `btrfs; + return( ret ); + } + map<string, map> EncryptDevices(map<string, map> target, string vg) { @@ -399,7 +421,10 @@ boolean need_boot( map disk ) { - return( Partitions::NeedBoot() || + y2milestone( "need_boot NeedBoot:%1 GetProposalBtrfs:%2 type:%3", + Partitions::NeedBoot(), GetProposalBtrfs(), + disk["type"]:`CT_UNKNOWN ); + return( Partitions::NeedBoot() || GetProposalBtrfs() || disk["type"]:`CT_UNKNOWN == `CT_DMRAID ); } @@ -413,7 +438,8 @@ ``(e["mount"]:""=="/"))) > 0; map tc = conf; y2milestone( "try_add_boot conf %1", conf ); - y2milestone( "try_add_boot boot %1 root %2 force %3", boot, root, force ); + y2milestone( "try_add_boot boot %1 root %2 force %3 need_boot:%4", + boot, root, force, need_boot(disk) ); if( !boot && (root||force) && (disk["cyl_count"]:0>Partitions::BootCyl() || need_boot(disk)) ) { @@ -2543,7 +2569,6 @@ return( ret ); } - list<map> can_mp_reuse( string mp, integer min, integer max, list<map> partitions ) { @@ -2571,8 +2596,7 @@ if( !p["delete"]:false && p["device"]:""==pl[0,"device"]:"" ) { - p = Storage::SetVolOptions( p, mp, - Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, mp, PropDefaultFs(), "", "", "" ); } return( p ); @@ -2609,7 +2633,7 @@ list<map> ret = []; y2milestone( "get_proposal have_swap:%1 disk %2", have_swap, disk ); map root = $[ "mount" : "/", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 0 ]; + "fsys" : PropDefaultFs(), "size" : 0 ]; map opts = GetControlCfg(); map conf = $[ "partitions" : [] ]; list<integer> swap_sizes = []; @@ -2627,7 +2651,7 @@ if( GetProposalHome() && opts["home_limit"]:0 < avail_size ) { map home = $[ "mount" : "/home", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 512*1024*1024, + "fsys" : PropDefaultFs(), "size" : 512*1024*1024, "pct" : 100-opts["root_percent"]:40 ]; conf["partitions"] = maplist( map p, conf["partitions"]:[], ``{ @@ -2946,7 +2970,7 @@ target = AddWinInfo(target); ret["target"] = target; map root = $[ "mount" : "/", "increasable" : true, - "fsys" : Partitions::DefaultFs(), "size" : 0 ]; + "fsys" : PropDefaultFs(), "size" : 0 ]; map opts = GetControlCfg(); list<string> ddev = get_disk_try_list( target, true ); string sol_disk = ""; @@ -3149,7 +3173,7 @@ opts["home_limit"]:0 < avail_size ) { map home = $[ "mount" : "/home", "increasable" : true, - "fsys" : Partitions::DefaultFs(), + "fsys" : PropDefaultFs(), "size" : 512*1024*1024, "pct" : 100-opts["root_percent"]:40 ]; conf["partitions"] = @@ -3609,8 +3633,7 @@ map p = $[ "create":true, "name" : "root", "device" : ret["device"]:"" + "/root", "size_k" : pe_to_sizek(root_pe,pe) ]; - p = Storage::SetVolOptions( p, "/", Partitions::DefaultFs(), - "", "", "" ); + p = Storage::SetVolOptions( p, "/", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm created %1", p ); ret["partitions"] = add( ret["partitions"]:[], p ); } @@ -3620,7 +3643,7 @@ ``{ if( p["name"]:"" == "root" ) { - p = Storage::SetVolOptions( p, "/", Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, "/", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm reuse %1", p ); } @@ -3655,8 +3678,7 @@ map p = $[ "create":true, "name" : "home", "device" : ret["device"]:"" + "/home", "size_k" : pe_to_sizek(home_pe,pe) ]; - p = Storage::SetVolOptions( p, "/home", Partitions::DefaultFs(), - "", "", "" ); + p = Storage::SetVolOptions( p, "/home", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm created %1", p ); ret["partitions"] = add( ret["partitions"]:[], p ); } @@ -3666,7 +3688,7 @@ ``{ if( p["name"]:"" == "home" ) { - p = Storage::SetVolOptions( p, "/home", Partitions::DefaultFs(), + p = Storage::SetVolOptions( p, "/home", PropDefaultFs(), "", "", "" ); y2milestone( "modify_vm reuse %1", p ); } @@ -4012,4 +4034,144 @@ return ret; } +global term AddCommonWidgets() + { + term vb = `VBox(); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), + // Label text + _("Create &LVM Based Proposal"), GetProposalLvm() )))); + vb = add( vb, + `Left(`HBox(`HSpacing(7), `CheckBox(`id(`encrypt), `opt(`notify), + // Label text + _("Encr&ypt Volume Group"), GetProposalEncrypt())))); + vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), `opt(`notify), + // Label text + _("Propose Separate &Home Partition"), + GetProposalHome() )))); + vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), + // Label text + _("Use &Btrfs as default Filesystem"), + GetProposalBtrfs() )))); + term frame = `VBox( `VSpacing(1.5), + `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); + //`HVCenter(`Frame( _("Proposal settings"), `HVCenter(vb) ))); + y2milestone( "AddCommonWidgets Home:%1 Btrfs:%2", GetProposalHome(), + GetProposalBtrfs() ); + return( frame ); + } + +boolean QueryProposalPassword() + { + if (!isempty(StorageProposal::GetProposalPassword())) + return true; + + UI::OpenDialog(`VBox( + `Label(_("Enter your password for the proposal encryption.")), + `MinWidth(40, + `Password(`id(`pw1), + // Label: get password for user root + // Please use newline if label is longer than 40 characters + _("Password:"), "")), + `VSpacing(0.5), + `MinWidth(40, + `Password(`id(`pw2), + // Label: get same password again for verification + // Please use newline if label is longer than 40 characters + _("Reenter the password for verification:"), "")), + `Label(_("Don't forget what you enter here!")), + `ButtonBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + )); + + string password = ""; + symbol widget = nil; + + repeat + { + // Clear password fields on every round. + UI::ChangeWidget(`id(`pw1), `Value, ""); + UI::ChangeWidget(`id(`pw2), `Value, ""); + + UI::SetFocus(`id(`pw1)); + + widget = (symbol) UI::UserInput(); + + switch (widget) + { + case `ok: + + password = (string) UI::QueryWidget(`id(`pw1), `Value); + string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); + + if (!Storage::CheckEncryptionPasswords(password, tmp, 8, false)) + widget = `again; + + break; + } + } until (widget == `cancel || widget == `ok); + + UI::CloseDialog(); + + if (widget == `ok) + { + StorageProposal::SetProposalPassword(password); + return true; + } + else + { + return false; + } + } + +global boolean HandleCommonWidgets( symbol id ) + { + boolean ret = false; + boolean val = (boolean) UI::QueryWidget(`id(id), `Value); + y2milestone( "id:%1 val:%2", ret, val ); + switch( id ) + { + case `lvm: + StorageProposal::SetProposalLvm(val); + UI::ChangeWidget(`id(`encrypt), `Enabled, val); + ret = true; + break; + + case `encrypt: + if( val ) + { + if (QueryProposalPassword()) + { + StorageProposal::SetProposalEncrypt(true); + } + else + { + UI::ChangeWidget(`id(`encrypt), `Value, false); + } + } + else + { + StorageProposal::SetProposalEncrypt(false); + } + ret = true; + break; + + case `btrfs: + StorageProposal::SetProposalBtrfs(val); + ret = true; + break; + + case `home: + StorageProposal::SetProposalHome(val); + ret = true; + break; + } + return( ret ); + } } Added: trunk/storage/storage/src/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/.c… ============================================================================== --- trunk/storage/storage/src/testsuite/.cvsignore (added) +++ trunk/storage/storage/src/testsuite/.cvsignore Thu Feb 17 15:49:12 2011 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test -- 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] r63438 - /tags/stable-2_20_5/installation/
by aschnell＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: aschnell Date: Thu Feb 17 13:54:06 2011 New Revision: 63438 URL: http://svn.opensuse.org/viewcvs/yast?rev=63438&view=rev Log: Created tag stable-2_20_5 for installation Added: tags/stable-2_20_5/installation/ - copied from r63437, trunk/installation/ -- 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] r63437 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call
by aschnell＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: aschnell Date: Thu Feb 17 13:51:18 2011 New Revision: 63437 URL: http://svn.opensuse.org/viewcvs/yast?rev=63437&view=rev Log: - fixed braille support during installation (bnc #672086) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63437&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Feb 17 13:51:18 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 17 13:51:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 17 13:49:19 CET 2011 - aschnell(a)suse.de + +- fixed braille support during installation (bnc #672086) +- 2.20.5 + +------------------------------------------------------------------- Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz - Adapted openSUSE control file to the current naming schema of Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Feb 17 13:51:18 2011 @@ -124,10 +124,11 @@ if [ $INST_MODE = "normal" ];then if [ ! -z "$Braille" ];then log "Braille config needed, setting up braille display" - sed -e "s#brlname=.*#brlname=$Braille#" \ - -e "s#brlport=.*#brlport=$Brailledevice#" /etc/suse-blinux.conf \ + # downcase $Braille so that brld will find the driver + sed -e "s#brlname=.*#brlname=${Braille,,}#" \ + -e "s#brlport=.*#brlport=$Brailledevice#" /etc/sbl.conf \ >/tmp/suse-blinux.conf - mv -f /tmp/suse-blinux.conf /etc + mv -f /tmp/suse-blinux.conf /etc/sbl.conf /etc/init.d/brld start /etc/init.d/sbl start fi -- 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] r63436 - /tags/stable-2_20_2/users/
by jsuchome＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: jsuchome Date: Thu Feb 17 11:10:21 2011 New Revision: 63436 URL: http://svn.opensuse.org/viewcvs/yast?rev=63436&view=rev Log: Created tag stable-2_20_2 for users Added: tags/stable-2_20_2/users/ - copied from r63435, trunk/users/ -- 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] r63435 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm
by jsuchome＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: jsuchome Date: Thu Feb 17 11:10:13 2011 New Revision: 63435 URL: http://svn.opensuse.org/viewcvs/yast?rev=63435&view=rev Log: - do not run both 'user' and 'user_non_interactive' steps (bnc#672139) - 2.20.2 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=63435&r1=63434… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Feb 17 11:10:13 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Feb 17 11:10:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 17 10:59:38 CET 2011 - jsuchome(a)suse.cz + +- do not run both 'user' and 'user_non_interactive' steps + (bnc#672139) +- 2.20.2 + +------------------------------------------------------------------- Fri Dec 3 12:41:56 CET 2010 - jsuchome(a)suse.cz - when user is disabled, disable its autologin (bnc#653559) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=634… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Thu Feb 17 11:10:13 2011 @@ -918,12 +918,16 @@ } # enable inst_user to either run auth client or write first user if ($after_auth ne "users" || $user_defined) { - y2milestone ("enabling step 'user' for second stage"); + # do not let both steps to run (bnc#672139) if ($user_defined) { + y2milestone ("enabling 'user_non_interactive', disabling 'user' for second stage"); ProductControl->EnableModule ("user_non_interactive"); + ProductControl->DisableModule ("user"); } else { + y2milestone ("enabling 'user', disabling 'user_non_interactive' for second stage"); ProductControl->EnableModule ("user"); + ProductControl->DisableModule ("user_non_interactive"); } } # no user entered + 2nd stage visible => enable clients (bnc#393722) -- 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] r63434 - /trunk/packager/src/modules/WebpinPackageSearch.ycp
by locilka＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: locilka Date: Thu Feb 17 11:08:12 2011 New Revision: 63434 URL: http://svn.opensuse.org/viewcvs/yast?rev=63434&view=rev Log: Just a little fix to use the given API instead of internal variables Modified: trunk/packager/src/modules/WebpinPackageSearch.ycp Modified: trunk/packager/src/modules/WebpinPackageSearch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/WebpinPacka… ============================================================================== --- trunk/packager/src/modules/WebpinPackageSearch.ycp (original) +++ trunk/packager/src/modules/WebpinPackageSearch.ycp Thu Feb 17 11:08:12 2011 @@ -347,7 +347,7 @@ y2milestone ("Distribution not set, guessing '%1'", distribution); } - string url = base_url + search_path + distribution + "/" + URL::EscapeString (search_for, URL::transform_map_passwd); + string url = GetBaseSearchURL() + search_path + distribution + "/" + URL::EscapeString (search_for, URL::transform_map_passwd); y2milestone ("HTTP::Get (%1, %2)", url, temporary_file); map response = HTTP::Get (url, temporary_file); -- 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] r63433 - /trunk/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 14:23:31 2011 New Revision: 63433 URL: http://svn.opensuse.org/viewcvs/yast?rev=63433&view=rev Log: aligned changelog with the actual changelog from obs 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 Wed Feb 16 14:23:31 2011 @@ -11,7 +11,6 @@ Wed Aug 18 15:23:05 CEST 2010 - mzugec(a)suse.cz - fixed typos (bnc#631743) -- 2.19.1 ------------------------------------------------------------------- Thu Jul 22 10:05:25 UTC 2010 - rhafer(a)novell.com @@ -20,11 +19,12 @@ (bnc#619549) ------------------------------------------------------------------- -Tue Jul 6 12:30:23 UTC 2010 - rhafer(a)novell.com +Tue Jul 6 11:29:07 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) +- 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 -- 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] r63432 - /tags/stable-2_20_0/ldap-server/
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 14:12:53 2011 New Revision: 63432 URL: http://svn.opensuse.org/viewcvs/yast?rev=63432&view=rev Log: Created tag stable-2_20_0 for ldap-server Added: tags/stable-2_20_0/ldap-server/ (props changed) - copied from r63431, trunk/ldap-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63431 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 12:02:47 2011 New Revision: 63431 URL: http://svn.opensuse.org/viewcvs/yast?rev=63431&view=rev Log: preparing 2.20.0 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=63431&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Wed Feb 16 12:02:47 2011 @@ -1 +1 @@ -2.19.1 +2.20.0 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 Wed Feb 16 12:02:47 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Feb 16 11:00:52 UTC 2011 - rhafer(a)suse.de + +- Version 2.20.0 +- Warn user, when creating a database with a non-standard base DN and + disable base-object creation in such case (bnc#669213) +- Allow non-standard db-directory when creating the first database + (bnc#669213) + +------------------------------------------------------------------- Wed Aug 18 15:23:05 CEST 2010 - mzugec(a)suse.cz - fixed typos (bnc#631743) -- 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] r63430 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm ldap-server.ycp tree_structure.ycp
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 12:00:19 2011 New Revision: 63430 URL: http://svn.opensuse.org/viewcvs/yast?rev=63430&view=rev Log: Warn user, when creating a database with a non-standard base DN and disable base-object creation in such case (bnc#669213) Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/ldap-server.ycp trunk/ldap-server/src/tree_structure.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 Wed Feb 16 12:00:19 2011 @@ -19,6 +19,7 @@ string ldapconf_basedn = ""; boolean createDbDir = false; + boolean createBase = true; term editPolicy = @@ -75,6 +76,17 @@ ) ); + global define boolean GetCreateBase() + { + return createBase; + } + + global define boolean ResetCreateBase() + { + createBase = true; + return true; + } + global define symbol AddDbBasic( boolean createDefaults ) { boolean user_changed_dbdir = false; @@ -297,6 +309,29 @@ Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" ); continue; } + integer rc = LdapServer::CheckSuffixAutoCreate( db["suffix"]:"" ); + if ( rc < 0 ) + { + map<string, string> err = LdapServer::ReadError(); + Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" ); + continue; + } + else if ( rc > 0 ) + { + map<string, string> err = LdapServer::ReadError(); + boolean res = Popup::AnyQuestion(Label::WarningMsg(), + _("The Base Object: \"") + db["suffix"]:"" + + _("\" can not be auto created by YaST.\n") + + err["msg"]:"", + Label::OKButton(), Label::CancelButton(), `focus); + if ( res == false ) { + continue; + } else { + y2debug( "Will not create base objects" ); + createBase = false; + } + + } if( db["directory"]:"" == "" ) { Popup::Error( _("A directory must be specified.") ); @@ -445,7 +480,9 @@ UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , true ); UI::ChangeWidget( `cb_pp_append_basedn, `Enabled, true ); - UI::ChangeWidget( `pb_define_policy, `Enabled , true ); + if (LdapDatabase::GetCreateBase() ) { + UI::ChangeWidget( `pb_define_policy, `Enabled , true ); + } } else { UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); 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 Wed Feb 16 12:00:19 2011 @@ -2420,6 +2420,42 @@ return 1; } +## + # Check whether the object named be the supplied LDAP DN can be auto-created. + # @returns 0 in case of success, + # <0 if the supplied DN is invalid + # >0 if autocreation is not possible + # +BEGIN { $TYPEINFO {CheckSuffixAutoCreate} = ["function", "integer", "string" ]; } +sub CheckSuffixAutoCreate +{ + my ($self, $suffix) = @_; + my $object = X500::DN->ParseRFC2253($suffix); + my @attr = $object->getRDN($object->getRDNs()-1)->getAttributeTypes(); + my $val = $object->getRDN($object->getRDNs()-1)->getAttributeValue($attr[0]); + if(!defined $attr[0] || !defined $val) + { + y2error("Error while extracting RDN values"); + $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", can't extract RDN values")); + return -1; + } + if( (lc($attr[0]) eq "ou") || ( lc($attr[0]) eq "o") || ( lc($attr[0]) eq "l") || + ( lc($attr[0]) eq "st") || ( lc($attr[0]) eq "dc") ) { + return 0; + } elsif( lc($attr[0]) eq "c") { + if($val !~ /^\w{2}$/) { + $self->SetError( _("The value of the \"c\" Attribute must contain a valid ISO-3166 country 2-letter code."), ""); + y2error("The countryName must be an ISO-3166 country 2-letter code."); + return -1; + } + return 0; + } else { + y2error("First part of suffix must be c=, st=, l=, o=, ou= or dc=."); + $self->SetError( _("First part of suffix must be c=, st=, l=, o=, ou= or dc=."), ""); + return 1; + } +} + BEGIN { $TYPEINFO {CheckDatabase} = ["function", "boolean", [ "map" , "string", "any"] ]; } sub CheckDatabase { @@ -2462,10 +2498,10 @@ } -BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean" ]; } +BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean", "boolean" ]; } sub AddDatabase { - my ($self, $index, $db, $createDir) = @_; + my ($self, $index, $db, $createDir, $createBase) = @_; if ( ! $self->CheckDatabase($db) ) { return 0; @@ -2577,10 +2613,13 @@ $self->SetError( $err->{'summary'}, $err->{'description'} ); return 0; } - push @added_databases, $db->{'suffix'}; - $self->WriteAuthInfo( $db->{'suffix'}, + + if ( $createBase ) { + push @added_databases, $db->{'suffix'}; + $self->WriteAuthInfo( $db->{'suffix'}, { bind_dn => $db->{'rootdn'}, bind_pw => $db->{'rootpw_clear'} } ); + } return 1; } Modified: trunk/ldap-server/src/ldap-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.ycp?… ============================================================================== --- trunk/ldap-server/src/ldap-server.ycp (original) +++ trunk/ldap-server/src/ldap-server.ycp Wed Feb 16 12:00:19 2011 @@ -96,7 +96,7 @@ // y2milestone("db-options : %1", db); // - ret = LdapServer::AddDatabase(0,db, true); + ret = LdapServer::AddDatabase(0,db, true, true); if(!ret) { 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 Wed Feb 16 12:00:19 2011 @@ -550,12 +550,13 @@ { rebuild_widget_tree = true; map <string,any> newDb = LdapDatabase::GetDatabase(); - if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir() ) ) + if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir(), LdapDatabase::GetCreateBase() ) ) { map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } + LdapDatabase::ResetCreateBase(); map <string,any> syncrepl = LdapDatabase::GetSyncRepl(); if ( size(syncrepl) > 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] r63429 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQContextMenu.cc src/YQContextMenu.h
by tgoettlicher＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: tgoettlicher Date: Wed Feb 16 11:10:48 2011 New Revision: 63429 URL: http://svn.opensuse.org/viewcvs/yast?rev=63429&view=rev Log: fixed bnc #671147 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQContextMenu.cc trunk/qt/src/YQContextMenu.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63429&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Feb 16 11:10:48 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Feb 16 11:10:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 16 11:14:10 CET 2011 - tgoettlicher(a)suse.de + +- Fixed event handling in context menu (bnc #671147) +- V 2.20.3 + +------------------------------------------------------------------- Fri Feb 11 14:57:41 CET 2011 - tgoettlicher(a)suse.de - Fixed event handling in tree widget Modified: trunk/qt/src/YQContextMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.cc?rev=6342… ============================================================================== --- trunk/qt/src/YQContextMenu.cc (original) +++ trunk/qt/src/YQContextMenu.cc Wed Feb 16 11:10:48 2011 @@ -52,6 +52,7 @@ YQContextMenu::YQContextMenu() : QObject () , YContextMenu( ) + , _suppressCancelEvent(false ) { yuiWarning() << "YQContextMenu"; @@ -147,14 +148,17 @@ { // dirty hack // see menuEntryActivated() for details - QTimer::singleShot( 100, this, SLOT( slotReturnMenuHidden() ) ); + QTimer::singleShot( 150, this, SLOT( slotReturnMenuHidden() ) ); } void YQContextMenu::slotReturnMenuHidden() { - YQUI::ui()->sendEvent( new YCancelEvent() ); + if ( ! _suppressCancelEvent ) + YQUI::ui()->sendEvent( new YCancelEvent() ); + + _suppressCancelEvent = false; } @@ -181,6 +185,7 @@ /* * the 100 delay is a ugly dirty workaround */ + _suppressCancelEvent = true; QTimer::singleShot( 100, this, SLOT( returnNow() ) ); } else Modified: trunk/qt/src/YQContextMenu.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.h?rev=63429… ============================================================================== --- trunk/qt/src/YQContextMenu.h (original) +++ trunk/qt/src/YQContextMenu.h Wed Feb 16 11:10:48 2011 @@ -150,6 +150,7 @@ private: QPoint _position; + bool _suppressCancelEvent; }; -- 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] r63428 - in /branches/SuSE-Code-11-SP2-Branch/ncurses: package/yast2-ncurses.changes src/NCMultiSelectionBox.cc
by gs＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: gs Date: Wed Feb 16 10:54:26 2011 New Revision: 63428 URL: http://svn.opensuse.org/viewcvs/yast?rev=63428&view=rev Log: NCMultiSelectionBox: adjust preferred width, avoid invalid pointers Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Wed Feb 16 10:54:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 16 10:51:16 CET 2011 - gs(a)suse.de + +- NCMultiSelectionBox: adjust preferred width, avoid invalid + pointers + +------------------------------------------------------------------- Wed Oct 13 14:26:38 CEST 2010 - gs(a)suse.de - NCRichText: bug-fix for pre tag (bnc #484629) Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc Wed Feb 16 10:54:26 2011 @@ -40,7 +40,8 @@ int NCMultiSelectionBox::preferredWidth() { - return wGetDefsze().W; + wsze sze = wGetDefsze(); + return sze.W > ( int )( labelWidth() + 2 ) ? sze.W : ( labelWidth() + 2 ); } @@ -77,7 +78,8 @@ void NCMultiSelectionBox::setCurrentItem( YItem * item ) { - myPad()->ScrlLine( item->index() ); + if ( item ) + myPad()->ScrlLine( item->index() ); } void NCMultiSelectionBox::addItem( YItem * item ) @@ -136,22 +138,27 @@ bool NCMultiSelectionBox::isItemSelected( YItem *item ) { - return item->selected(); + if ( item ) + return item->selected(); + else + return false; } void NCMultiSelectionBox::selectItem( YItem *yitem, bool selected ) { - YMultiSelectionBox::selectItem( yitem, selected ); - - //retrieve pointer to the line tag associated with this item - NCTableTag * tag = ( NCTableTag * )yitem->data(); - YUI_CHECK_PTR( tag ); + if ( yitem ) + { + YMultiSelectionBox::selectItem( yitem, selected ); - tag->SetSelected( selected ); + //retrieve pointer to the line tag associated with this item + NCTableTag * tag = ( NCTableTag * )yitem->data(); + YUI_CHECK_PTR( tag ); - DrawPad(); + tag->SetSelected( selected ); + DrawPad(); + } } @@ -162,6 +169,8 @@ for ( unsigned int i = 0; i < getNumLines(); i++ ) { NCTableTag *t = tagCell( i ); + YUI_CHECK_PTR( t ); + t->SetSelected( false ); } @@ -176,8 +185,8 @@ void NCMultiSelectionBox::toggleCurrentItem() { YItem *it = currentItem(); - selectItem( it, !( it->selected() ) ); - + if ( it ) + selectItem( it, !( it->selected() ) ); } -- 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] r63427 - /trunk/yast2/scripts/yast2
by aschnell＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: aschnell Date: Tue Feb 15 17:47:07 2011 New Revision: 63427 URL: http://svn.opensuse.org/viewcvs/yast?rev=63427&view=rev Log: - changed snapper description text Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=63427&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Feb 15 17:47:07 2011 @@ -215,7 +215,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast2 $1"` + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast $1"` fi fi } -- 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] r63426 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: rhafer Date: Tue Feb 15 17:39:56 2011 New Revision: 63426 URL: http://svn.opensuse.org/viewcvs/yast?rev=63426&view=rev Log: Allow non-standard db-directory when creating the first database (bnc#669213) 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 Tue Feb 15 17:39:56 2011 @@ -1696,7 +1696,7 @@ 'suffix' => $dbDefaults{'suffix'}, 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, - 'directory' => '/var/lib/ldap', + 'directory' => $dbDefaults{'directory'}, 'entrycache' => YaST::YCP::Integer($dbDefaults{'entrycache'}), 'idlcache' => YaST::YCP::Integer($dbDefaults{'idlcache'}), 'checkpoint' => [ YaST::YCP::Integer($dbDefaults{'checkpoint'}->[0]), @@ -1755,6 +1755,20 @@ return $rc; } + if ( ! defined SCR->Read(".target.dir", $database->{directory}) ) { + my $ret = SCR->Execute(".target.bash", "mkdir -m 0700 -p ".$database->{directory}); + if( ( $ret ) && ( ! defined SCR->Read(".target.dir", $database->{directory}) ) ) { + $self->SetError(_("Could not create database directory."), ""); + return $ret; + } + my $owner = SCR->Read('.sysconfig.openldap.OPENLDAP_USER'); + my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP'); + $ret = SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$database->{directory}); + if ( $ret ) { + $self->SetError(_("Could adjust ownership of database directory."), ""); + return $ret; + } + } SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); if ( $dbDefaults{'defaultIndex'} == 1 || ( ref($dbDefaults{'defaultIndex'}) eq "YaST::YCP::Boolean" && -- 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] r63425 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: jsuchome Date: Tue Feb 15 16:24:52 2011 New Revision: 63425 URL: http://svn.opensuse.org/viewcvs/yast?rev=63425&view=rev Log: one table for all different data shown for single (WIP) ask for restoring Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Tue Feb 15 16:24:52 2011 @@ -79,8 +79,8 @@ list<map> snapshots = Snapper::snapshots; integer i = -1; - list single_snapshot_items = []; - list coupled_snapshot_items = []; + list snapshot_items = []; +// list coupled_snapshot_items = []; foreach (map s, snapshots, { i = i + 1; @@ -92,8 +92,8 @@ if (s["type"]:`none == `SINGLE) { - single_snapshot_items = add (single_snapshot_items, - `item (`id (i), date, num, s["description"]:"")); + snapshot_items = add (snapshot_items, + `item (`id (i), num, _("Single"), date, "", s["description"]:"")); } else if (s["type"]:`none == `POST) { @@ -106,8 +106,8 @@ } string desc = Snapper::snapshots[index,"description"]:""; string pre_date = timestring ("%c", Snapper::snapshots[index,"date"]:0, false); - coupled_snapshot_items = add (coupled_snapshot_items, - `item (`id (i), pre, pre_date, num, date, desc)); + snapshot_items = add (snapshot_items, + `item (`id (i), sformat ("%1 - %2", pre, num), _("Pre & Post"), pre_date, date, desc)); } else { @@ -116,6 +116,7 @@ }); term contents = `VBox ( + /* // table label `Left (`Label (_("Single Snapshots"))), `Table (`id (`single_snapshots_table), `opt(`notify, `keepSorting), `header ( @@ -130,10 +131,12 @@ `VSpacing (0.5), // table label `Left (`Label (_("Coupled Snapshots"))), - `Table (`id (`coupled_snapshots_table), `opt(`notify, `keepSorting), `header ( + */ + `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( // table header - _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), - coupled_snapshot_items +// _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), + _("ID"), _("Type"), _("Start Date"), _("End Date"), _("Description")), + snapshot_items ), `HBox ( `PushButton (`id (`show_c), `opt (`default), _("Show Changes")), @@ -146,9 +149,11 @@ Wizard::HideBackButton (); Wizard::HideAbortButton (); - UI::SetFocus (`id (`coupled_snapshots_table)); + UI::SetFocus (`id (`snapshots_table)); + /* if (coupled_snapshot_items == [] && single_snapshot_items != []) UI::SetFocus (`id (`single_snapshots_table)); + */ any ret = nil; while(true) { @@ -157,6 +162,7 @@ integer selected = 0; + /* if (ret == `single_snapshots_table || ret == `coupled_snapshots_table) { selected = (integer) UI::QueryWidget (`id (ret), `CurrentItem); ret = `show; @@ -165,8 +171,9 @@ selected = (integer) UI::QueryWidget (`id (`single_snapshots_table), `CurrentItem); ret = `show; } - if (ret == `show_c) { - selected = (integer) UI::QueryWidget (`id (`coupled_snapshots_table), `CurrentItem); + */ + if (ret == `show_c || ret == `snapshots_table) { + selected = (integer) UI::QueryWidget (`id (`snapshots_table), `CurrentItem); ret = `show; } @@ -221,6 +228,7 @@ string description = Snapper::snapshots[pre_index,"description"]:""; string pre_date = timestring ("%c", Snapper::snapshots[pre_index,"date"]:0, false); string date = timestring ("%c", snapshot["date"]:0, false); + symbol type = snapshot["type"]:`NONE; if (!haskey (snapshot, "files")) { @@ -303,7 +311,10 @@ void show_file_modification (string file, integer from, integer to) { term content = `VBox (); + // busy popup message + Popup::ShowFeedback ("", _("Calculating file modifications...")); map modification = Snapper::GetFileModification (file, from, to); + Popup::ClearFeedback (); if (haskey (modification, "diff")) { string diff = modification["diff"]:""; @@ -371,14 +382,35 @@ } } + string tree_label = sformat ("%1 - %2", previous_num, snapshot_num); + term date_widget = `VBox ( + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`pre_date), _("Time of taking the first snapshot:")), + `Right (`Label (pre_date)) + ), + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`post_date), _("Time of taking the second snapshot:")), + `Right (`Label (date)) + ) + ); + if (type == `SINGLE) + { + tree_label = tostring (snapshot_num); + date_widget = `HBox ( + // label, date string will follow at the end of line + `Label (`id (`date), _("Time of taking the snapshot:")), + `Right (`Label (date)) + ); + } + term contents = `HBox ( `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), `HBox ( `HSpacing (), `ReplacePoint (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `multiSelection), - sformat ("%1 - %2", previous_num, snapshot_num), [] - ) + `Tree (`id(`tree), tree_label, []) ), `HSpacing () ), @@ -394,16 +426,7 @@ ))), `HWeight (2, `VBox ( `Left (`Label (`id (`desc), description)), - `HBox ( - // label, date string will follow at the end of line - `Label (`id (`pre_date), _("Time of taking the first snapshot:")), - `Right (`Label (pre_date)) - ), - `HBox ( - // label, date string will follow at the end of line - `Label (`id (`post_date), _("Time of taking the second snapshot:")), - `Right (`Label (date)) - ), + date_widget, `Frame ("", `HBox ( `HSpacing (0.5), `VBox ( `VSpacing (0.5), @@ -438,9 +461,7 @@ if (size (tree_items) > 0) { UI::ReplaceWidget (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `multiSelection), - sformat ("%1 - %2", previous_num, snapshot_num), tree_items - ) + `Tree (`id(`tree), `opt (`notify, `immediate, `multiSelection), tree_label, tree_items) ); // no item is selected UI::ChangeWidget (`tree, `CurrentItem, nil); @@ -495,16 +516,29 @@ continue; } else if (ret == `next) { - if (true) + list<string> files = (list<string>) UI::QueryWidget (`id (`tree), `SelectedItems); + y2internal ("files: %1", files); + files = filter (string file, files, { + return haskey (files_index, file); + }); + y2internal ("files: %1", files); + + if (files == []) { + // popup message Popup::Message (_("No file was selected for restoring")); continue; } - else if (Popup::YesNo (_("This will probably ruin your system. Are you sure?"))) + // FIXME restore from PRE or POST? + // popup headline + if (Popup::AnyQuestionRichText (_("Restoring files"), + // popup message + sformat (_("These files will be restored from snapshot %1:<br>%2<br>Are you sure?"), + snapshot_name, mergestring (files, "<br>")), + 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { y2milestone ("restoring files..."); - // do it - break; + // TODO copy the files } continue; } -- 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] r63424 - in /trunk/network: package/yast2-network.changes src/modules/DSL.ycp
by mvidner＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: mvidner Date: Tue Feb 15 15:20:09 2011 New Revision: 63424 URL: http://svn.opensuse.org/viewcvs/yast?rev=63424&view=rev Log: DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/DSL.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Feb 15 15:20:09 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 15 15:19:47 CET 2011 - mvidner(a)suse.cz + +- DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) + +------------------------------------------------------------------- Mon Jan 17 14:10:10 UTC 2011 - mvidner(a)novell.com - fixed progress messages being out of sync when writing LAN config Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue Feb 15 15:20:09 2011 @@ -568,7 +568,7 @@ global list<string> Packages() { if(size(NetworkInterfaces::List("dsl")) < 1) return []; - return ["smpppd", "ppp", "pptp", "linux-atm-lib"]; + return ["smpppd", "ppp", "pptp", "libatm1"]; } /** -- 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] r63423 - /tags/stable-2_20_6/ncurses/
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 14:09:54 2011 New Revision: 63423 URL: http://svn.opensuse.org/viewcvs/yast?rev=63423&view=rev Log: Created tag stable-2_20_6 for ncurses Added: tags/stable-2_20_6/ncurses/ - copied from r63422, trunk/ncurses/ -- 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] r63422 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 14:07:51 2011 New Revision: 63422 URL: http://svn.opensuse.org/viewcvs/yast?rev=63422&view=rev Log: modified bug-fix for bnc #652240 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=63422&r1=634… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Feb 15 14:07:51 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Feb 15 14:07:51 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 15 13:53:30 CET 2011 - gs(a)suse.de + +- Correct color for shortcuts and visible cursor in text entry + (modified bug-fix for bnc #652240) +- V 2.20.6 + +------------------------------------------------------------------- Wed Feb 9 13:42:49 CET 2011 - gs(a)suse.de - Bugfixes in NCTree (currentItem works correctly) and -- 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] r63421 - in /trunk/ncurses/src: NCTextPad.cc ncursesw.cc
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 14:07:21 2011 New Revision: 63421 URL: http://svn.opensuse.org/viewcvs/yast?rev=63421&view=rev Log: check #ifdef NCURSES_EXT_COLORS instead of exact patch version (which will change) Modified: trunk/ncurses/src/NCTextPad.cc trunk/ncurses/src/ncursesw.cc Modified: trunk/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=634… ============================================================================== --- trunk/ncurses/src/NCTextPad.cc (original) +++ trunk/ncurses/src/NCTextPad.cc Tue Feb 15 14:07:21 2011 @@ -355,7 +355,7 @@ setcchar( &cchar, wch, attr, color, NULL ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from attr_get (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS cchar.ext_color = 0; #endif ins_wch( curs.L, curs.C++, &cchar ); @@ -496,7 +496,7 @@ setcchar( &cchar, wch, attr, color, NULL ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from attr_get (bcn#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS cchar.ext_color = 0; #endif ins_wch( cl, cc++, &cchar ); Modified: trunk/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.cc?rev=6342… ============================================================================== --- trunk/ncurses/src/ncursesw.cc (original) +++ trunk/ncurses/src/ncursesw.cc Tue Feb 15 14:07:21 2011 @@ -139,7 +139,7 @@ // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from mvwin_wch (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS combined->ext_color = 0; #endif return ret; @@ -152,7 +152,7 @@ combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from win_wch (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS combined->ext_color = 0; #endif return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0