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