January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60234 - /tags/branch-Code-11-SP1-2_17_78/yast2/
by lslezak＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: lslezak Date: Tue Jan 5 16:24:59 2010 New Revision: 60234 URL: http://svn.opensuse.org/viewcvs/yast?rev=60234&view=rev Log: Created tag branch-Code-11-SP1-2_17_78 for yast2 Added: tags/branch-Code-11-SP1-2_17_78/yast2/ (props changed) - copied from r60233, branches/SuSE-Code-11-SP1-Branch/yast2/ -- 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] r60233 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION library/wizard/src/Wizard.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: lslezak Date: Tue Jan 5 16:24:52 2010 New Revision: 60233 URL: http://svn.opensuse.org/viewcvs/yast?rev=60233&view=rev Log: - added missing UI::SetProductName() call - display the proper product name in help texts (using &product; macro) (bnc#535483) - 2.17.78 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/wizard/src/Wizard.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Tue Jan 5 16:24:52 2010 @@ -1 +1 @@ -2.17.77 +2.17.78 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/wizard/src/Wizard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/wizard/src/Wizard.ycp Tue Jan 5 16:24:52 2010 @@ -1801,6 +1801,7 @@ { y2milestone ("Setting product name to '%1'", name); product_name = name; + UI::SetProductName(product_name); } } Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Tue Jan 5 16:24:52 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz + +- added missing UI::SetProductName() call - display the proper + product name in help texts (using &product; macro) (bnc#535483) +- 2.17.78 + +------------------------------------------------------------------- Thu Nov 26 18:10:42 CET 2009 - kmachalkova(a)suse.cz - Fixed striping trailing \n from Hostname::CurrentHostname() -- 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] r60232 - in /trunk/storage/storage/src/include: custom_part_check_generated.ycp custom_part_dialogs.ycp ep-hd-lib.ycp ep-lib.ycp
by aschnell＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: aschnell Date: Tue Jan 5 16:02:38 2010 New Revision: 60232 URL: http://svn.opensuse.org/viewcvs/yast?rev=60232&view=rev Log: - removed obsolete bsd_label parameter Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Tue Jan 5 16:02:38 2010 @@ -486,7 +486,7 @@ } -define symbol check_devices_used( list<map> partitions, boolean not_cr ) +symbol check_devices_used(list<map> partitions, boolean not_cr) { symbol ret = `UB_NONE; list<map> pl = filter( map p, partitions, @@ -519,21 +519,8 @@ } - -define boolean check_device_edit( map curr_part, boolean bsd_label ) - ``{ - /////////////////////////////////////////////////////// - // with a BSD-Disklabel partition 3 is always an additional entry - // which describes the disk and should not be edited - - if( bsd_label && curr_part["type"]:`unknown==`primary && - curr_part["nr"]:0==3 ) - { - // popup text - Popup::Message(_("Partition 3 \"Entire Disk\" is not changeable")); - return false; - } - +boolean check_device_edit(map curr_part) + { symbol used = check_devices_used( [ curr_part ], false ); if( used == `UB_MD) @@ -564,25 +551,10 @@ return( ret ); } -define boolean check_device_delete( map curr_part, boolean bsd_label, - boolean installation, map disk ) - ``{ - string part_name = curr_part["device"]:""; - - if( bsd_label ) - { - /////////////////////////////////////////////////////// - // with BSD-Disklabel partition 3 is always an additionl entry, - // which describes the disk and should not be edited - if( bsd_label && curr_part["type"]:`unknown==`primary && - curr_part["nr"]:0==3 ) - { - // popup text - Popup::Message(_("Partition 3 \"Entire Disk\" is not changeable")); - return false; - } - } +boolean check_device_delete(map curr_part, boolean installation, map disk) + { + string part_name = curr_part["device"]:""; symbol used = check_devices_used( [ curr_part ], false ); @@ -689,11 +661,11 @@ if( ret ) ret = Storage::CanDelete( curr_part, disk, true ); return ret; - }; + } -define boolean check_extended_delete( map curr_disk, boolean installation ) - ``{ +boolean check_extended_delete( map curr_disk, boolean installation ) + { ///////////////////////////////////////////////// // filter delete partitions list<map> partitions = curr_disk["partitions"]:[]; @@ -789,5 +761,5 @@ ret = Storage::CanDelete( extd, curr_disk, true ); } return( ret ); - }; + } } 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 Tue Jan 5 16:02:38 2010 @@ -1407,9 +1407,8 @@ * Check if at least on partition is mounted. * @return map targetMap */ -define boolean deleteAllDevPartitions( map<string, any> disk, - boolean installation, boolean bsd_label ) - ``{ +boolean deleteAllDevPartitions(map<string, any> disk, boolean installation) + { boolean go_on = true; string del_dev = disk["device"]:""; y2milestone( "deleteAllDevPartitions disk:%1", remove( disk, "partitions" )); @@ -1505,6 +1504,6 @@ } y2milestone( "deleteAllDevPartitions ret:%1", go_on ); return(go_on); - }; + } } Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Jan 5 16:02:38 2010 @@ -96,7 +96,7 @@ // popup text if (Popup::YesNo(sformat(_("Really delete BIOS RAID %1?"), device))) { - if (deleteAllDevPartitions(disk, Stage::initial(), false)) + if (deleteAllDevPartitions(disk, Stage::initial())) Storage::DeleteDmraid(device); UpdateMainStatus(); @@ -120,7 +120,7 @@ else { - if ( ConfirmPartitionsDelete( device, pnames) && deleteAllDevPartitions(disk, Stage::initial(), false)) + if (ConfirmPartitionsDelete(device, pnames) && deleteAllDevPartitions(disk, Stage::initial())) { UpdateMainStatus(); UpdateNavigationTree(`hd); Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Jan 5 16:02:38 2010 @@ -180,7 +180,7 @@ { if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) { - if( deleteAllDevPartitions( disk, Stage::initial(), false )) + if (deleteAllDevPartitions(disk, Stage::initial())) Storage::DeleteDmraid( id ); return true; } @@ -188,13 +188,13 @@ // YesNo popup text %1 is replaced by a disk name e.g. /dev/hda else if( Popup::YesNo( sformat(_("Really delete all partitions on %1?"), id ))) { - deleteAllDevPartitions( disk, Stage::initial(), false ); + deleteAllDevPartitions(disk, Stage::initial()); return true; } } else if( part["type"]:`unknown==`lvm ) { - if( !check_device_delete( part, false, Stage::initial(), $[] )) + if (!check_device_delete(part, Stage::initial(), $[])) { return false; } @@ -241,8 +241,7 @@ return false; } - if (!check_device_delete( part, false, Stage::initial(), - disk )) + if (!check_device_delete(part, Stage::initial(), disk)) return false; } -- 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] r60231 - in /trunk/storage/storage/src/include: ep-dialogs.ycp ep-main.ycp
by aschnell＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: aschnell Date: Tue Jan 5 14:23:34 2010 New Revision: 60231 URL: http://svn.opensuse.org/viewcvs/yast?rev=60231&view=rev Log: - use HTML::List - moved import Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Tue Jan 5 14:23:34 2010 @@ -9,7 +9,6 @@ { textdomain "storage"; - import "Icon"; include "partitioning/custom_part_lib.ycp"; @@ -836,18 +835,10 @@ UI::CloseDialog(); } - boolean ConfirmRecursiveDelete( string device, list<string> partitions, - string headline, string text_before, - string text_after ) - { - string plist = "<ul>"; - - foreach( string one_part, partitions, { - plist = plist + "<li>" + one_part + "</li>"; - }); - - plist = plist + "</ul>"; + boolean ConfirmRecursiveDelete(string device, list<string> devices, string headline, string text_before, + string text_after) + { term button_box = `ButtonBox ( `PushButton(`id(`yes), `opt(`okButton), Label::DeleteButton() ), `PushButton(`id(`no_button), `opt(`default, `cancelButton), Label::CancelButton()) @@ -867,7 +858,7 @@ `VSpacing (0.2), `Left( `Label( text_before ) ), `VSpacing (0.2), - `Left(`RichText(plist)), + `Left(`RichText(HTML::List(sort(devices)))), `VSpacing (0.2), `Left(`Label( text_after)), button_box @@ -875,14 +866,10 @@ ) ); - boolean success = (boolean) UI::OpenDialog( layout); - any ret = nil; - - if( success ){ - ret = UI::UserInput(); - UI::CloseDialog(); - } + UI::OpenDialog(layout); + symbol ret = (symbol) UI::UserInput(); + UI::CloseDialog(); - return (ret == `yes); + return ret == `yes; } } Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Jan 5 14:23:34 2010 @@ -34,6 +34,7 @@ import "Directory"; import "HTML"; import "Map"; + import "Icon"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/raid_lib.ycp"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60230 - /trunk/autoinstallation/src/include/io.ycp
by ug＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: ug Date: Tue Jan 5 10:34:14 2010 New Revision: 60230 URL: http://svn.opensuse.org/viewcvs/yast?rev=60230&view=rev Log: better mounting for usb:// and device:// Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Tue Jan 5 10:34:14 2010 @@ -305,6 +305,7 @@ if( haskey( m, "dev_name") ) { integer i = 0; string dev = m["dev_name"]:""; + deviceList = add( deviceList, substring( dev, 5 ) ); // not uncommon for USB sticks to have no partition do { i = i + 1; dev = m["dev_name"]:"" + sformat("%1",i); @@ -346,9 +347,13 @@ } }); y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); - if( ! already_mounted ) - WFM::Execute(.local.mount, [sformat("/dev/%1", Host) , - mount_point]); + if( ! already_mounted && + !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host), + mount_point]) ) { + y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host)); + GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host)); + continue; + } if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 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] r60229 - /tags/stable-2_19_0/http-server/
by mzugec＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: mzugec Date: Mon Jan 4 17:47:25 2010 New Revision: 60229 URL: http://svn.opensuse.org/viewcvs/yast?rev=60229&view=rev Log: Created tag stable-2_19_0 for http-server Added: tags/stable-2_19_0/http-server/ - copied from r60228, trunk/http-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] r60228 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm
by mzugec＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: mzugec Date: Mon Jan 4 17:47:12 2010 New Revision: 60228 URL: http://svn.opensuse.org/viewcvs/yast?rev=60228&view=rev Log: determine vhost by HostIP instead of ServerName (bnc#567027) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=60228&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Mon Jan 4 17:47:12 2010 @@ -1 +1 @@ -2.18.9 +2.19.0 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Mon Jan 4 17:47:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 4 17:43:07 CET 2010 - mzugec(a)suse.cz + +- determine vhost by HostIP instead of ServerName (bnc#567027) +- 2.19.0 + +------------------------------------------------------------------- Tue Jul 7 12:26:55 CEST 2009 - mzugec(a)suse.cz - defined proxy_ajp in HTTPModules.pm (bnc#518816) Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?re… ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Mon Jan 4 17:47:12 2010 @@ -528,6 +528,8 @@ } else { $vhost_files->{$servername} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } + + $self->validateNVH(); } @@ -572,25 +574,27 @@ $self->deleteVH($hostid); $self->createVH($hostid, $data, $params); - $self->validateNVH(); +# $self->validateNVH(); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } - my @tmp_data=(); - foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); - } - $vhost_files->{main}{DATA} = \@tmp_data; + + my @tmp_data=(); + foreach my $row (@{$vhost_files->{main}{DATA}}){ + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + } + $vhost_files->{main}{DATA} = \@tmp_data; - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } -- 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] r60227 - /trunk/storage/storage/src/modules/StorageClients.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 17:14:30 2010 New Revision: 60227 URL: http://svn.opensuse.org/viewcvs/yast?rev=60227&view=rev Log: - cleanup Modified: trunk/storage/storage/src/modules/StorageClients.ycp Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Mon Jan 4 17:14:30 2010 @@ -91,9 +91,7 @@ // Please use newline if label is longer than 40 characters sformat(_("&Enter password for device %1:"), device), password), `ButtonBox( - // Ok button - `PushButton(`id(`ok), `opt(`default), Label::OKButton()), - // Cancel button + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) ) ) -- 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] r60226 - /tags/branch-Code-11-SP1-2_17_62/installation/
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:33:28 2010 New Revision: 60226 URL: http://svn.opensuse.org/viewcvs/yast?rev=60226&view=rev Log: Created tag branch-Code-11-SP1-2_17_62 for installation Added: tags/branch-Code-11-SP1-2_17_62/installation/ (props changed) - copied from r60225, branches/SuSE-Code-11-SP1-Branch/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] r60225 - /tags/branch-Code-11-SP1-2_17_64/packager/
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:32:11 2010 New Revision: 60225 URL: http://svn.opensuse.org/viewcvs/yast?rev=60225&view=rev Log: Created tag branch-Code-11-SP1-2_17_64 for packager Added: tags/branch-Code-11-SP1-2_17_64/packager/ (props changed) - copied from r60224, branches/SuSE-Code-11-SP1-Branch/packager/ -- 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] r60224 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:30:48 2010 New Revision: 60224 URL: http://svn.opensuse.org/viewcvs/yast?rev=60224&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Mon Jan 4 16:30:48 2010 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 4 16:30:48 2010 @@ -2,6 +2,7 @@ Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz - Fixed accepting/declining the multilicense agreement. +- 2.17.64 ------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz -- 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] r60223 - in /branches/SuSE-Code-11-SP1-Branch/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:30:36 2010 New Revision: 60223 URL: http://svn.opensuse.org/viewcvs/yast?rev=60223&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Mon Jan 4 16:30:36 2010 @@ -1 +1 @@ -2.17.61 +2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Mon Jan 4 16:30:36 2010 @@ -2,6 +2,7 @@ Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - Adapted for new API to ProductLicense (FATE #306295). +- 2.17.62 ------------------------------------------------------------------- Wed Dec 9 16:44:34 CET 2009 - locilka(a)suse.cz -- 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] r60222 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:19:12 2010 New Revision: 60222 URL: http://svn.opensuse.org/viewcvs/yast?rev=60222&view=rev Log: Fixed accepting/declining the multilicense agreement. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Jan 4 16:19:12 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz + +- Fixed accepting/declining the multilicense agreement. + +------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - ProductLicense prepared for multi-license dialogs (FATE #306295). Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:19:12 2010 @@ -790,8 +790,10 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) { + y2milestone ("License %1 does not need to be accepted", one_license_id); return; + } eula_id = sformat ("eula_%1", one_license_id); if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { @@ -800,7 +802,10 @@ } // All licenses have to be accepted - if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { + string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton); + y2milestone ("License %1 accepted: %2", eula_id, license_accepted); + + if (! regexpmatch (license_accepted, "^yes_")) { accepted = false; break; } @@ -1124,9 +1129,9 @@ y2milestone("AutoYaST: License has been accepted automatically"); ret = `accepted; } else { - foreach (map <string, string> tmp_licenses, licenses, { - symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); - }); + map <string, string> tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); } // store already accepted license IDs -- 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] r60221 - in /branches/SuSE-Code-11-SP1-Branch/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:18:56 2010 New Revision: 60221 URL: http://svn.opensuse.org/viewcvs/yast?rev=60221&view=rev Log: Fixed accepting/declining the multilicense agreement. Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 4 16:18:56 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------ +Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz + +- Fixed accepting/declining the multilicense agreement. + ------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:18:56 2010 @@ -790,8 +790,10 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) { + y2milestone ("License %1 does not need to be accepted", one_license_id); return; + } eula_id = sformat ("eula_%1", one_license_id); if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { @@ -800,7 +802,10 @@ } // All licenses have to be accepted - if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { + string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton); + y2milestone ("License %1 accepted: %2", eula_id, license_accepted); + + if (! regexpmatch (license_accepted, "^yes_")) { accepted = false; break; } @@ -1124,9 +1129,9 @@ y2milestone("AutoYaST: License has been accepted automatically"); ret = `accepted; } else { - foreach (map <string, string> tmp_licenses, licenses, { - symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); - }); + map <string, string> tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); } // store already accepted license IDs -- 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] r60220 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 15:51:00 2010 New Revision: 60220 URL: http://svn.opensuse.org/viewcvs/yast?rev=60220&view=rev Log: - use SplitDevice function Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Jan 4 15:51:00 2010 @@ -53,6 +53,7 @@ } } + term HdButtonBox() { return `HBox( @@ -65,37 +66,48 @@ ); } + void HandleHdButtons( any user_data, string device, map event ) { - string disk = ""; + string disk_device = ""; boolean is_disk = false; if (user_data == nil) { - map dev = Storage::GetDiskPartition( device ); - disk = (string) dev["disk"]:nil; - // FIXME: is this necessary & sufficient condition? - is_disk = dev["nr"]:nil == ""; + map disk = nil; + map part = nil; + + map<string, map> target_map = Storage::GetTargetMap(); + SplitDevice(target_map, device, disk, part); + disk_device = (string) disk["device"]:""; + is_disk = part == nil; } else { - disk = (string) user_data; + disk_device = (string) user_data; } switch (Event::IsWidgetActivated(event)) { case `add: - EpCreatePartition( disk ); + if (is_disk) + EpCreatePartition(disk_device); + else + // error popup + Popup::Error(_("Select a hard disks, BIOS RAIDs or multipath +devices to add a partition.")); break; + case `edit: - if ( is_disk ) - TreePanel::SwitchToNew( disk ); + if (is_disk) + TreePanel::SwitchToNew( disk_device ); else EpEditPartition( device ); break; case `resize: - if ( is_disk ) + if (is_disk) + // error popup Popup::Error(_("Hard disks, BIOS RAIDs and multipath devices cannot be resized.")); else @@ -103,14 +115,15 @@ break; case `delete: - if ( is_disk ) - EpDeleteDisk( device ); + if (is_disk) + EpDeleteDisk(disk_device); else EpDeletePartition ( device, UI::WidgetExists(`id(`table)) ? `table : `overview ); break; } } + void CreateHdMainPanel(any user_data) { symbol Predicate(map disk, map partition) -- 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] r60219 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 14:37:32 2010 New Revision: 60219 URL: http://svn.opensuse.org/viewcvs/yast?rev=60219&view=rev Log: - use ButtonBox widget (bnc #565871) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Jan 4 14:37:32 2010 @@ -271,8 +271,7 @@ `HSpacing(4) ), `VSpacing(2), - `HBox( - // Ok button + `ButtonBox( `PushButton(`id("ok"), `opt(`default), Label::OKButton()), // Cancel button `PushButton(`id("cancel"), _("&Skip") ) -- 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] r60218 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 14:31:24 2010 New Revision: 60218 URL: http://svn.opensuse.org/viewcvs/yast?rev=60218&view=rev Log: - use ButtonBox widget (bnc #565871) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jan 4 14:31:24 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 04 14:29:41 CET 2010 - aschnell(a)suse.de + +- use ButtonBox widget (bnc #565871) + +------------------------------------------------------------------- Tue Dec 29 18:53:27 CET 2009 - aschnell(a)suse.de - ported MdPart code from SLE11 SP1 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 Mon Jan 4 14:31:24 2010 @@ -101,8 +101,8 @@ ), `VSpacing(3), `ButtonBox( - `PushButton(`id("ok"), `opt(`default), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `PushButton(`id("ok"), `opt(`default), Label::OKButton()), + `PushButton(`id("cancel"), Label::CancelButton()) ), `VSpacing(0.5) ) @@ -416,10 +416,10 @@ `HSpacing(1)), `VSpacing(1), `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton()))) + `ButtonBox( + `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ) ); @@ -669,11 +669,10 @@ `HSpacing(1)), `VSpacing(1), `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton())) - ) + `ButtonBox( + `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ) ); -- 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] r60217 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:39:28 2010 New Revision: 60217 URL: http://svn.opensuse.org/viewcvs/yast?rev=60217&view=rev Log: - disallow RAIDs on partitioned RAIDs Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Mon Jan 4 12:39:28 2010 @@ -52,14 +52,17 @@ // no RAID devices (this is for experts only, by hand) list<map> allret = []; + + list<symbol> allowed_ctypes = [ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ]; list types_no = [ `lvm, `sw_raid ]; list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_MD ]; list allowed_enc_types = [ `none ]; - foreach( string dev, map devmap, targetMap, - ``{ + foreach (string dev, map devmap, targetMap, { + if (contains(allowed_ctypes, devmap["type"]:`CT_UNKNOWN)) + { ret = filter( map p, devmap["partitions"]:[], ``( size(p["mount"]:"")==0 && !contains( types_no, p["type"]:`primary ) && @@ -67,6 +70,7 @@ contains( ubs, p["used_by_type"]:`UB_NONE ) && (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 )))); allret = (list<map>)merge(allret, ret ); + } }); return( allret ); }; -- 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] r60216 - /branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:39:18 2010 New Revision: 60216 URL: http://svn.opensuse.org/viewcvs/yast?rev=60216&view=rev Log: - disallow RAIDs on partitioned RAIDs Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp Mon Jan 4 12:39:18 2010 @@ -53,14 +53,17 @@ // no RAID devices (this is for experts only, by hand) list<map> allret = []; + + list<symbol> allowed_ctypes = [ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ]; list types_no = [ `lvm, `sw_raid, `evms ]; list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_MD ]; list allowed_enc_types = [ `none ]; - foreach( string dev, map devmap, targetMap, - ``{ + foreach (string dev, map devmap, targetMap, { + if (contains(allowed_ctypes, devmap["type"]:`CT_UNKNOWN)) + { ret = filter( map p, devmap["partitions"]:[], ``( size(p["mount"]:"")==0 && !contains( types_no, p["type"]:`primary ) && @@ -68,6 +71,7 @@ contains( ubs, p["used_by_type"]:`UB_NONE ) && (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 )))); allret = (list<map>)merge(allret, ret ); + } }); return( allret ); }; -- 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] r60215 - /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:33:02 2010 New Revision: 60215 URL: http://svn.opensuse.org/viewcvs/yast?rev=60215&view=rev Log: - handle MDPART in container sorting function Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h Mon Jan 4 12:33:02 2010 @@ -37,13 +37,14 @@ static const int order[COTYPE_LAST_ENTRY] = { 0, // CUNKNOWN 1, // DISK - 4, // MD - 7, // LOOP - 6, // LVM - 5, // DM + 5, // MD + 8, // LOOP + 7, // LVM + 6, // DM 2, // DMRAID - 8, // NFSC - 3 // DMMULTIPATH + 9, // NFSC + 3, // DMMULTIPATH + 4 // MDPART }; bool ret = order[a] < order[b]; -- 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] r60214 - /tags/stable-2_19_4/country/
by jsuchome＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: jsuchome Date: Mon Jan 4 10:53:20 2010 New Revision: 60214 URL: http://svn.opensuse.org/viewcvs/yast?rev=60214&view=rev Log: Created tag stable-2_19_4 for country Added: tags/stable-2_19_4/country/ - copied from r60213, trunk/country/ -- 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] r60213 - /trunk/country/yast2-country.spec.in
by jsuchome＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: jsuchome Date: Mon Jan 4 10:52:03 2010 New Revision: 60213 URL: http://svn.opensuse.org/viewcvs/yast?rev=60213&view=rev Log: added to spec Modified: trunk/country/yast2-country.spec.in Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?re… ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Mon Jan 4 10:52:03 2010 @@ -83,6 +83,7 @@ @schemadir@/autoyast/rnc/*.rnc @desktopdir@/yast-language.desktop @desktopdir@/timezone.desktop +@desktopdir@/keyboard.desktop %attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy %package data -- 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] r60212 - in /trunk/country: VERSION keyboard/src/dialogs.ycp keyboard/src/keyboard.desktop package/yast2-country.changes
by jsuchome＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: jsuchome Date: Mon Jan 4 10:51:26 2010 New Revision: 60212 URL: http://svn.opensuse.org/viewcvs/yast?rev=60212&view=rev Log: - returned keyboard desktop file, adapted help text (bnc#560713) - 2.19.4 Added: trunk/country/keyboard/src/keyboard.desktop Modified: trunk/country/VERSION trunk/country/keyboard/src/dialogs.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60212&r1=602… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Jan 4 10:51:26 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/country/keyboard/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/dialogs.ycp… ============================================================================== --- trunk/country/keyboard/src/dialogs.ycp (original) +++ trunk/country/keyboard/src/dialogs.ycp Mon Jan 4 10:51:26 2010 @@ -208,24 +208,36 @@ // help text for keyboard screen (header) string help_text = _(" -<big>Keyboard Configuration</big>") + +<big>Keyboard Configuration</big>"); - // help text for keyboard screen - _(" + if (Stage::initial () || Stage::firstboot ()) + { + + help_text = help_text + + // help text for keyboard screen (installation) + _(" Choose the Keyboard Layout to use for installation and in the installed system. Test the layout in Test. For advanced options, such as repeat rate and delay, select Expert Settings. "); - - // general help trailer - help_text = help_text + _(" + // general help trailer + help_text = help_text + _(" If unsure, use the default values already selected. "); + } + else + help_text = help_text + + // help text for keyboard screen (installation) + _(" +Choose the Keyboard Layout to use in the system. +For advanced options, such as repeat rate and delay, select Expert Settings. +Find more options as well as more layouts in the keyboard layout tool of your desktop environment. +"); // Screen title for keyboard screen - Wizard::SetContents ( _("Keyboard Configuration"), contents, help_text, + Wizard::SetContents ( _("System Keyboard Configuration"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true); Wizard::SetDesktopIcon("keyboard"); Added: trunk/country/keyboard/src/keyboard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.de… ============================================================================== --- trunk/country/keyboard/src/keyboard.desktop (added) +++ trunk/country/keyboard/src/keyboard.desktop Mon Jan 4 10:51:26 2010 @@ -0,0 +1,28 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=keyboard + +X-SuSE-YaST-Group=Hardware +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=keyboard +X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=keyboard.rnc +X-SuSE-YaST-Keywords=keyboard + +Icon=yast-keyboard +Exec=/sbin/yast2 keyboard + +Name=System Keyboard Layout +GenericName=Select the system keyboard +X-KDE-SubstituteUID=true +StartupNotify=true Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Jan 4 10:51:26 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 4 10:47:25 CET 2010 - jsuchome(a)suse.cz + +- returned keyboard desktop file, adapted help text (bnc#560713) +- 2.19.4 + +------------------------------------------------------------------- Fri Dec 4 14:11:30 CET 2009 - jsuchome(a)suse.cz - install ntp together with yast2-ntp-client (bnc#560732) -- 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] r60211 - /tags/branch-SLE-10-SP3-2_13_12/firstboot/
by jsuchome＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: jsuchome Date: Mon Jan 4 09:06:56 2010 New Revision: 60211 URL: http://svn.opensuse.org/viewcvs/yast?rev=60211&view=rev Log: Created tag branch-SLE-10-SP3-2_13_12 for firstboot Added: tags/branch-SLE-10-SP3-2_13_12/firstboot/ - copied from r60210, branches/SuSE-SLE-10-SP3-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] r60210 - in /branches/SuSE-SLE-10-SP3-Branch/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_keyboard.ycp
by jsuchome＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: jsuchome Date: Mon Jan 4 09:06:40 2010 New Revision: 60210 URL: http://svn.opensuse.org/viewcvs/yast?rev=60210&view=rev Log: - handle arguments from control file (bnc#566669) - 2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/firstboot/VERSION branches/SuSE-SLE-10-SP3-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-SLE-10-SP3-Branch/firstboot/src/firstboot_keyboard.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/firstboot/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/firstboot/VERSION Mon Jan 4 09:06:40 2010 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/firstboot/package/yast2-firstboot.changes Mon Jan 4 09:06:40 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 4 08:51:37 CET 2010 - jsuchome(a)suse.cz + +- handle arguments from control file (bnc#566669) +- 2.13.12 + +------------------------------------------------------------------- Tue Aug 4 15:20:20 CEST 2009 - jsuchome(a)suse.cz - retranslate wizard steps after language change (bnc#524969) Modified: branches/SuSE-SLE-10-SP3-Branch/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/firstboot/src/firstboot_keyboard.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/firstboot/src/firstboot_keyboard.ycp Mon Jan 4 09:06:40 2010 @@ -9,6 +9,7 @@ textdomain "country"; import "Arch"; + import "GetInstArgs"; import "Directory"; import "Keyboard"; import "Firstboot"; @@ -21,7 +22,7 @@ Keyboard::Read (); - ret = KeyboardDialog ($[]); + ret = KeyboardDialog (GetInstArgs::argmap()); if (ret == `next) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0