September 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58847 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mzugec＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: mzugec Date: Wed Sep 30 17:21:17 2009 New Revision: 58847 URL: http://svn.opensuse.org/viewcvs/yast?rev=58847&view=rev Log: - YaPI: validate routing - YaPI: split code in Write into separate functions Modified: trunk/network/src/lan/YaPI/NETWORK.pm Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?… ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Wed Sep 30 17:21:17 2009 @@ -39,11 +39,12 @@ %configuration = ( 'bootproto' => LanItems->bootproto ); } elsif (LanItems->bootproto eq "static"){ %configuration = ( 'bootproto' => 'static' ); - %configuration->{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; + $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; } $interfaces{LanItems->interfacename}=\%configuration; } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { - $interfaces{%{LanItems->getCurrentItem()}->{"hwinfo"}->{"dev_name"}}= {}; + my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; + $interfaces{$device}= {}; } } @@ -56,21 +57,22 @@ return \%ret; } -BEGIN{$TYPEINFO{Write} = ["function", - "boolean",["map","string","any"]]; -} -sub Write { - my $self = shift; - my $args = shift; - y2milestone("YaPI->Write with settings:", Dumper(\$args)); - # SAVE DEFAULT ROUTE - if (exists($args->{'route'})){ +sub writeRoute { + my $args = shift; + my %ret = ('exit'=>0, 'error'=>''); + my $gw=""; my $dest=""; my @route = (); if (defined ($args->{'route'}->{'default'}->{'via'})){ $gw = $args->{'route'}->{'default'}->{'via'}; if ($gw ne ""){ + YaST::YCP::Import ("IP"); + unless (IP->Check4($gw) eq "") { + $ret{'exit'} = -1; + $ret{'error'} = IP->Valid4(); + return \%ret; + }; $dest = "default"; @route = ( {"destination" => $dest, "gateway" => $gw, @@ -84,27 +86,36 @@ Routing->Routes( \@route ); y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes)); Routing->Write(); - } - # SAVE HOSTNAME - if (exists($args->{'hostname'})){ + return \%ret; +} + +sub writeHostname { + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; y2milestone("hostname", Dumper(\$args->{'hostname'})); DNS->Read(); DNS->hostname($args->{'hostname'}->{'name'}); DNS->domain($args->{'hostname'}->{'domain'}); DNS->modified(1); DNS->Write(); - } - # SAVE DNS Settings - if (exists($args->{'dns'})){ + return $ret; +} + +sub writeDNS { + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; y2milestone("dns", Dumper(\$args->{'dns'})); DNS->Read(); DNS->nameservers($args->{'dns'}->{'nameservers'}); DNS->searchlist($args->{'dns'}->{'searches'}); DNS->modified(1); DNS->Write(); - } - # SAVE DNS Settings - if (exists($args->{'interface'})){ + return $ret; +} + +sub writeInterfaces { + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; y2milestone("interface", Dumper(\$args->{'interface'})); foreach my $dev (keys %{$args->{'interface'}}){ YaST::YCP::Import ("NetworkInterfaces"); @@ -115,7 +126,7 @@ my $prefix="32"; YaST::YCP::Import ("Netmask"); my @ip_row = split(/\//, $ip); - my $prefix = $ip_row[$#ip_row]; + $prefix = $ip_row[$#ip_row]; if (Netmask->Check4($prefix)){ y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); $prefix = Netmask->ToBits($prefix); @@ -131,10 +142,41 @@ YaST::YCP::Import ("Service"); Service->Restart("network"); } + return $ret; +} + + +BEGIN{$TYPEINFO{Write} = ["function", + ["map","string","any"],["map","string","any"]]; +} +sub Write { + my $self = shift; + my $args = shift; +# my %ret = ('exit'=>0, 'error'=>''); + y2milestone("YaPI->Write with settings:", Dumper(\$args)); + # SAVE DEFAULT ROUTE + if (exists($args->{'route'})){ + my $route_ret = writeRoute($args); + return $route_ret if ($route_ret->{'exit'} != 0); + } + # SAVE HOSTNAME + if (exists($args->{'hostname'})){ + my $hn_ret = writeHostname($args); + return $hn_ret if ($hn_ret->{'exit'} != 0); + } + # SAVE DNS Settings + if (exists($args->{'dns'})){ + my $dns_ret = writeDNS($args); + return $dns_ret if ($dns_ret->{'exit'} != 0); + } + # SAVE interfaces Settings + if (exists($args->{'interface'})){ + my $ifc_ret = writeInterfaces($args); + return $ifc_ret if ($ifc_ret->{'exit'} != 0); } - return 1; + return {'exit'=>0, 'error'=>''}; } 1; -- 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] r58846 - /tags/branch-Code-11-SP1-2_17_100/network/
by mzugec＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: mzugec Date: Wed Sep 30 17:11:12 2009 New Revision: 58846 URL: http://svn.opensuse.org/viewcvs/yast?rev=58846&view=rev Log: Created tag branch-Code-11-SP1-2_17_100 for network Added: tags/branch-Code-11-SP1-2_17_100/network/ (props changed) - copied from r58845, branches/SuSE-Code-11-SP1-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] r58845 - /tags/branch-Code-11-SP1-2_17_100/
by mzugec＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: mzugec Date: Wed Sep 30 17:11:10 2009 New Revision: 58845 URL: http://svn.opensuse.org/viewcvs/yast?rev=58845&view=rev Log: Created tag branch-Code-11-SP1-2_17_100 Added: tags/branch-Code-11-SP1-2_17_100/ -- 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] r58844 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/lan/YaPI/NETWORK.pm
by mzugec＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: mzugec Date: Wed Sep 30 17:11:03 2009 New Revision: 58844 URL: http://svn.opensuse.org/viewcvs/yast?rev=58844&view=rev Log: YaPI: correctly handle netmask/prefixlen (bnc#539889) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Sep 30 17:11:03 2009 @@ -1 +1 @@ -2.17.99 +2.17.100 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Wed Sep 30 17:11:03 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 30 17:07:53 CEST 2009 - mzugec(a)suse.cz + +- YaPI: correctly handle netmask/prefixlen (bnc#539889) +- 2.17.100 + +------------------------------------------------------------------- Thu Sep 24 09:42:13 CEST 2009 - mzugec(a)suse.cz - YaPI: backported NETWORK.pm for webYaST Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Wed Sep 30 17:11:03 2009 @@ -107,20 +107,23 @@ if (exists($args->{'interface'})){ y2milestone("interface", Dumper(\$args->{'interface'})); foreach my $dev (keys %{$args->{'interface'}}){ -# YaST::YCP::Import ("LanItems"); -# LanItems->Read(); -# foreach my $iface (keys %{LanItems->Items}){ -# LanItems->current($iface); -# LanItems->DeleteItem(); -# } -# LanItems->Write(); YaST::YCP::Import ("NetworkInterfaces"); NetworkInterfaces->Read(); NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); NetworkInterfaces->Name($dev); + my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; + my $prefix="32"; + YaST::YCP::Import ("Netmask"); + my @ip_row = split(/\//, $ip); + my $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix)){ + y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); + $prefix = Netmask->ToBits($prefix); + } + $ip = $ip_row[0]."/".$prefix; my %config=("STARTMODE" => "auto", "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, - "IPADDR" => $args->{'interface'}->{$dev}->{'ipaddr'} + "IPADDR" => $ip ); NetworkInterfaces->Current(\%config); NetworkInterfaces->Commit(); -- 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] r58843 - /branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes
by lslezak＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: lslezak Date: Wed Sep 30 16:58:40 2009 New Revision: 58843 URL: http://svn.opensuse.org/viewcvs/yast?rev=58843&view=rev Log: fixed chronological order Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes 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 Wed Sep 30 16:58:40 2009 @@ -5,51 +5,19 @@ (backport from from trunk rev. 58399) - 2.17.71 -------------------------------------------------------------------- -Wed Sep 30 15:50:07 CEST 2009 - lslezak(a)suse.cz - +Merged changes from SP1-Stash branch: +- read X-SuSE-DocTeamID from desktop files (bnc#448238) - package new YaPI file SERVICES.pm (fate #306696) - -------------------------------------------------------------------- -Thu Jul 16 14:42:16 CEST 2009 - jsuchome(a)suse.cz - - Wizard.ycp: use Fancy UI for 1024x576 screen size (fate#306298) - -------------------------------------------------------------------- -Wed Jun 10 09:55:30 CEST 2009 - mzugec(a)suse.cz - - NetworkInterfaces - possible to not use LABEL for aliases (bnc#471253) (bnc#507640) - -------------------------------------------------------------------- -Tue May 26 18:59:03 CEST 2009 - juhliarik(a)suse.cz - - added fix for problem with parsing command line (bnc#462276) - -------------------------------------------------------------------- -Thu Apr 9 10:04:19 CEST 2009 - lslezak(a)suse.cz - - PackageSystem.ycp - check nil result of Pkg::PkgCommit() call which indicates an error (bnc#157551) - -------------------------------------------------------------------- -Wed Apr 8 11:27:13 CEST 2009 - lslezak(a)suse.cz - - PackageCallbacks.ycp - don't read non existing y2logRPM file (bnc#456446) ------------------------------------------------------------------- -Fri Apr 3 13:26:58 CEST 2009 - lslezak(a)suse.cz - -- Do not display "No package source" popup, just log a warning - (bnc#485587) - -------------------------------------------------------------------- -Wed Mar 18 13:08:36 CET 2009 - ug(a)suse.de - -- read X-SuSE-DocTeamID from desktop files (bnc#448238) - -------------------------------------------------------------------- Tue Jul 7 13:24:32 CEST 2009 - lslezak(a)suse.cz - Do not display "No package source" popup, just log a warning -- 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] r58842 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION package/yast2.changes
by lslezak＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: lslezak Date: Wed Sep 30 16:07:07 2009 New Revision: 58842 URL: http://svn.opensuse.org/viewcvs/yast?rev=58842&view=rev Log: - 2.17.71 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION 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 Wed Sep 30 16:07:07 2009 @@ -1 +1 @@ -2.17.70 +2.17.71 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 Wed Sep 30 16:07:07 2009 @@ -3,6 +3,7 @@ - Service.ycp - bad regexp, SuSEFirewall2_* not correctly recognized (backport from from trunk rev. 58399) +- 2.17.71 ------------------------------------------------------------------- Wed Sep 30 15:50:07 CEST 2009 - lslezak(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] r58841 - in /branches/SuSE-Code-11-SP1-Branch/yast2: ./ library/runlevel/src/Service.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 30 Sep '09

30 Sep '09

Author: lslezak Date: Wed Sep 30 15:54:25 2009 New Revision: 58841 URL: http://svn.opensuse.org/viewcvs/yast?rev=58841&view=rev Log: - Service.ycp - bad regexp, SuSEFirewall2_* not correctly recognized (backport from from trunk rev. 58399) Modified: branches/SuSE-Code-11-SP1-Branch/yast2/ (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/Service.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/Service.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/Service.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/runlevel/src/Service.ycp Wed Sep 30 15:54:25 2009 @@ -515,7 +515,7 @@ foreach(string s, splitstring(out["stdout"]:"", "\n"), { - string service = regexpsub(s, "^S[0-9]+([^0-9]*)", "\\1"); + string service = regexpsub(s, "^S[0-9]+([^0-9]+.*)", "\\1"); if (service != nil) { 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 Wed Sep 30 15:54:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 30 15:53:47 CEST 2009 - lslezak(a)suse.cz + +- Service.ycp - bad regexp, SuSEFirewall2_* not correctly recognized +(backport from from trunk rev. 58399) + +------------------------------------------------------------------- Wed Sep 30 15:50:07 CEST 2009 - lslezak(a)suse.cz - package new YaPI file SERVICES.pm (fate #306696) -- 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] <rest-service> master : fixed path for vendor translations
by Stefan Schubert 30 Sep '09

30 Sep '09

ref: refs/heads/master commit f555149139f7ab03a498a79ee97e74e66cd162b1 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Sep 30 15:53:09 2009 +0200 fixed path for vendor translations --- webservice-tasks/lib/tasks/package-local.rake | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index b016243..96ed0f9 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -29,8 +29,8 @@ Rake::PackageTask.new('www', :noversion) do |p| p.package_files.exclude('./db/schema.rb') p.package_files.exclude('./log/*.log') p.package_files.exclude('./vendor/plugins/rails_rcov') - p.package_files.exclude('./public/vendor/text/*.po') - p.package_files.exclude('./public/vendor/text/*.mo') + p.package_files.exclude('./public/vendor/text/locale') + p.package_files.exclude('./public/vendor/text/po') p.package_files.exclude('./public/vendor/images') p.package_files.exclude('./public/vendor/stylesheets') end -- 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] <rest-service> network : fixed path for vendor translations
by Stefan Schubert 30 Sep '09

30 Sep '09

ref: refs/heads/network commit f555149139f7ab03a498a79ee97e74e66cd162b1 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Sep 30 15:53:09 2009 +0200 fixed path for vendor translations --- webservice-tasks/lib/tasks/package-local.rake | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index b016243..96ed0f9 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -29,8 +29,8 @@ Rake::PackageTask.new('www', :noversion) do |p| p.package_files.exclude('./db/schema.rb') p.package_files.exclude('./log/*.log') p.package_files.exclude('./vendor/plugins/rails_rcov') - p.package_files.exclude('./public/vendor/text/*.po') - p.package_files.exclude('./public/vendor/text/*.mo') + p.package_files.exclude('./public/vendor/text/locale') + p.package_files.exclude('./public/vendor/text/po') p.package_files.exclude('./public/vendor/images') p.package_files.exclude('./public/vendor/stylesheets') end -- 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] <rest-service> eula : fixed path for vendor translations
by Stefan Schubert 30 Sep '09

30 Sep '09

ref: refs/heads/eula commit f555149139f7ab03a498a79ee97e74e66cd162b1 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Sep 30 15:53:09 2009 +0200 fixed path for vendor translations --- webservice-tasks/lib/tasks/package-local.rake | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake index b016243..96ed0f9 100644 --- a/webservice-tasks/lib/tasks/package-local.rake +++ b/webservice-tasks/lib/tasks/package-local.rake @@ -29,8 +29,8 @@ Rake::PackageTask.new('www', :noversion) do |p| p.package_files.exclude('./db/schema.rb') p.package_files.exclude('./log/*.log') p.package_files.exclude('./vendor/plugins/rails_rcov') - p.package_files.exclude('./public/vendor/text/*.po') - p.package_files.exclude('./public/vendor/text/*.mo') + p.package_files.exclude('./public/vendor/text/locale') + p.package_files.exclude('./public/vendor/text/po') p.package_files.exclude('./public/vendor/images') p.package_files.exclude('./public/vendor/stylesheets') end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0