May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64151 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 16:30:48 2011 New Revision: 64151 URL: http://svn.opensuse.org/viewcvs/yast?rev=64151&view=rev Log: More readability: no commented-out code; data structure alignment. 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 Mon May 30 16:30:48 2011 @@ -23,7 +23,6 @@ sub Read { my $self = shift; -# Hostname->Read(); DNS->Read(); Routing->Read(); LanItems->Read(); @@ -48,11 +47,22 @@ } #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, - 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, - 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} -# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} + my %ret = ( + 'interfaces' => \%interfaces, + 'routes' => { + 'default' => { + 'via' => Routing->GetGateway() + } + }, + 'dns' => { + 'nameservers' => \@{DNS->nameservers}, + 'searches' => \@{DNS->searchlist} + }, + 'hostname' => { + 'name' => Hostname->CurrentHostname, + 'domain' => Hostname->CurrentDomain, + 'dhcp_hostname' => DNS->dhcp_hostname + } ); 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

[yast-commit] r64150 - /trunk/network/src/lan/YaPI/NETWORK.pm
by mvidner＠svn2.opensuse.org 30 May '11

30 May '11

Author: mvidner Date: Mon May 30 16:17:11 2011 New Revision: 64150 URL: http://svn.opensuse.org/viewcvs/yast?rev=64150&view=rev Log: Reindent the mess! - http://perldoc.perl.org/perlstyle.html and http://doc.opensuse.org/projects/YaST/openSUSE11.3/codingrules/indentation.… agree on 4 columns - no tabs 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 Mon May 30 16:17:11 2011 @@ -18,43 +18,43 @@ # TODO: parameter map<string, boolean> what_I_Need BEGIN{$TYPEINFO{Read} = ["function", - [ "map", "string", "any"]]; + [ "map", "string", "any"]]; } sub Read { - my $self = shift; + my $self = shift; # Hostname->Read(); - DNS->Read(); - Routing->Read(); - LanItems->Read(); - - my %interfaces = (); - foreach my $devnum (keys %{LanItems->Items}){ - LanItems->current($devnum); - if (LanItems->IsItemConfigured()){ - my %configuration = (); - LanItems->SetItem(); - if (LanItems->isCurrentDHCP()){ - %configuration = ( 'bootproto' => LanItems->bootproto ); - } elsif (LanItems->bootproto eq "static"){ - %configuration = ( 'bootproto' => 'static' ); - $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; - } - $interfaces{LanItems->interfacename}=\%configuration; - } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { - my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; - $interfaces{$device}= {}; + DNS->Read(); + Routing->Read(); + LanItems->Read(); + + my %interfaces = (); + foreach my $devnum (keys %{LanItems->Items}){ + LanItems->current($devnum); + if (LanItems->IsItemConfigured()){ + my %configuration = (); + LanItems->SetItem(); + if (LanItems->isCurrentDHCP()){ + %configuration = ( 'bootproto' => LanItems->bootproto ); + } elsif (LanItems->bootproto eq "static"){ + %configuration = ( 'bootproto' => 'static' ); + $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; + } + $interfaces{LanItems->interfacename}=\%configuration; + } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { + my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; + $interfaces{$device}= {}; } - } + } - #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, + #FIXME: validate for nil values (dns espacially) + my %ret = ('interfaces'=>\%interfaces, 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} # 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} - ); - return \%ret; + ); + return \%ret; } sub writeRoute { @@ -65,121 +65,121 @@ 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)) { - $ret{'exit'} = -1; - $ret{'error'} = IP->Valid4(); - return \%ret; - }; - $dest = "default"; - @route = ( {"destination" => $dest, + $gw = $args->{'route'}->{'default'}->{'via'}; + if ($gw ne ""){ + YaST::YCP::Import ("IP"); + unless (IP->Check4($gw)) { + $ret{'exit'} = -1; + $ret{'error'} = IP->Valid4(); + return \%ret; + }; + $dest = "default"; + @route = ( {"destination" => $dest, "gateway" => $gw, "netmask" => "-", "device" => "-" - }); - } + }); + } } Routing->Read(); y2milestone("YaPI->Write before change Routes:", Dumper(Routing->Routes)); Routing->Routes( \@route ); y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes)); Routing->Write(); - return \%ret; + 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->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); - DNS->modified(1); - DNS->Write(); - return $ret; + 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->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); + DNS->modified(1); + DNS->Write(); + 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(); - return $ret; + 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(); + 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"); - 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); - $prefix = $ip_row[$#ip_row]; - if (Netmask->Check4($prefix) && $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" => $ip - ); - NetworkInterfaces->Current(\%config); - NetworkInterfaces->Commit(); - NetworkInterfaces->Write(""); - YaST::YCP::Import ("Service"); - Service->Restart("network"); - } - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("interface", Dumper(\$args->{'interface'})); + foreach my $dev (keys %{$args->{'interface'}}){ + 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); + $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix) && $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" => $ip + ); + NetworkInterfaces->Current(\%config); + NetworkInterfaces->Commit(); + NetworkInterfaces->Write(""); + YaST::YCP::Import ("Service"); + Service->Restart("network"); + } + return $ret; } BEGIN{$TYPEINFO{Write} = ["function", - ["map","string","any"],["map","string","any"]]; + ["map","string","any"],["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'})){ - 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 value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) - # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} - return {'exit'=>0, 'error'=>''}; + my $self = shift; + my $args = shift; + 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 value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) + # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} + 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] r64149 - /tags/branch-Code-11-SP2-2_17_3/snapper/
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 16:06:35 2011 New Revision: 64149 URL: http://svn.opensuse.org/viewcvs/yast?rev=64149&view=rev Log: Created tag branch-Code-11-SP2-2_17_3 for snapper Added: tags/branch-Code-11-SP2-2_17_3/snapper/ - copied from r64148, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r64148 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION agent-snapper/doc/snapper.html agent-snapper/src/SnapperAgent.cc package/yast2-snapper.changes src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 16:06:28 2011 New Revision: 64148 URL: http://svn.opensuse.org/viewcvs/yast?rev=64148&view=rev Log: - ask snapper library for snapshot paths - 2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Mon May 30 16:06:28 2011 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/doc/snapper.html Mon May 30 16:06:28 2011 @@ -56,6 +56,21 @@ </td> </tr> + <tr><td><tt>.snapper.path</td><td>YCPMap</td><td align="left">YCPMap</td> + <td>Return the path to directory with given snapshot<br> + <b>Example of argument map</b>: + <pre> + $[ + "num" : 1, + $] + </pre> + <b>Example of result</b>: + <pre> + "/snapshots/1/snapshot" + </pre> + </td> + </tr> + <tr><td><tt>.snapper.snapshots</td><td>(none)</td><td align="left">YCPList</td> <td>Return list of current snapshot maps.<br> <b>Example of result</b>: Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc Mon May 30 16:06:28 2011 @@ -148,7 +148,7 @@ if (path->length() == 1) { /** - * error: Read (.snapper.error) -> returns last error message + * Read (.snapper.error) -> returns last error message */ if (PC(0) == "error") { YCPMap retmap; @@ -156,6 +156,21 @@ return retmap; } /** + * Read (.snapper.path, $[ "num" : num]) -> returns the path to directory with given snapshot + */ + if (PC(0) == "path") { + unsigned int num = getIntValue (argmap, "num", 0); + const Snapshots& snapshots = sh->getSnapshots(); + Snapshots::const_iterator snap = snapshots.find(num); + if (snap == snapshots.end()) + { + y2error ("snapshot '%d' not found", num); + return ret; + } + return YCPString (snap->snapshotDir()); + } + + /** * Read(.snapper.snapshots) -> return list of snapshot description maps */ if (PC(0) == "snapshots") { Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Mon May 30 16:06:28 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:56:42 CEST 2011 - jsuchome(a)suse.cz + +- ask snapper library for snapshot paths +- 2.17.3 + +------------------------------------------------------------------- Wed May 11 11:35:31 CEST 2011 - jsuchome(a)suse.cz - only require libsnapper-devel Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Mon May 30 16:06:28 2011 @@ -43,8 +43,6 @@ // global list of all snapshot global list<map> snapshots = []; -global string snapshots_path = "/snapshots"; - global map selected_snapshot = $[]; // mapping of snapshot number to index in snapshots list @@ -70,15 +68,28 @@ } /** + * Return the path to given snapshot + */ +global string GetSnapshotPath (integer snapshot_num) { + string ret = (string) SCR::Read (.snapper.path, $[ "num" : snapshot_num ]); + if (ret == nil) + { + ret = ""; + // popup error + Report::Error (sformat (_("Snapshot '%1' was not found."), snapshot_num)); + } + return ret; +} + +/** * Describe what was done with given file between given snapshots * - when new is 0, meaning is 'current system' */ global map GetFileModification (string file, integer old, integer new) { map ret = $[]; - - string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); + string file1 = sformat ("%1%2", GetSnapshotPath (old), file); + string file2 = sformat ("%1%2", GetSnapshotPath (new), file); if (new == 0) file2 = file; @@ -270,7 +281,7 @@ UI::ChangeWidget (`id (`progress ), `Value, progress); - string orig = sformat ("%1/%2/snapshot", snapshots_path, snapshot_num) + file; + string orig = GetSnapshotPath (snapshot_num) + file; string dir = substring (file, 0, findlastof (file, "/")); if (!FileUtils::Exists (orig)) -- 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] r64147 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Makefile.am package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 30 May '11

30 May '11

Author: aschnell Date: Mon May 30 15:19:58 2011 New Revision: 64147 URL: http://svn.opensuse.org/viewcvs/yast?rev=64147&view=rev Log: - increased major version number of library (bnc#627422) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am Mon May 30 15:19:58 2011 @@ -88,7 +88,7 @@ Region.cc Region.h \ StorageTmpl.h StorageDefines.h -liby2storage_la_LDFLAGS = -version-info 2:0 +liby2storage_la_LDFLAGS = -version-info 3:0 liby2storage_la_LIBADD = -lblocxx -lxml2 plugin_LTLIBRARIES = libpy2StorageCallbacks.la Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon May 30 15:19:58 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 30 15:18:54 CEST 2011 - aschnell(a)suse.de + +- increased major version number of library (bnc#627422) + +------------------------------------------------------------------- Mon May 30 14:01:57 CEST 2011 - fehr(a)suse.de - testsuite is BuildRequires not Requires -- 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] r64146 - /trunk/slide-show/SuSELinux/slideshow.xml
by keichwa＠svn2.opensuse.org 30 May '11

30 May '11

Author: keichwa Date: Mon May 30 15:01:41 2011 New Revision: 64146 URL: http://svn.opensuse.org/viewcvs/yast?rev=64146&view=rev Log: update, submitted by aj Modified: trunk/slide-show/SuSELinux/slideshow.xml Modified: trunk/slide-show/SuSELinux/slideshow.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/SuSELinux/slideshow.x… ============================================================================== --- trunk/slide-show/SuSELinux/slideshow.xml (original) +++ trunk/slide-show/SuSELinux/slideshow.xml Mon May 30 15:01:41 2011 @@ -30,7 +30,7 @@ <title>openSUSE.org</title> <para> -openSUSE is a community project created and sponsored by Novell to +openSUSE is a community project created and sponsored by SUSE to deliver the world's most user-friendly computing platform. Many people from around the world contribute to the openSUSE Project by packaging software, testing programs, writing documentation, and translating @@ -68,7 +68,7 @@ performance, and a number of improvements designed to protect your privacy and prevent phishing attacks.</para> -<para>Also included with openSUSE are Novell Evolution and Kontact, +<para>Also included with openSUSE are Evolution and Kontact, complete e-mail and contact management applications. For instant messaging, openSUSE features easy to use IM clients that support all of the popular protocols: AIM, Google Talk, Jabber, MSN, Yahoo!, @@ -92,11 +92,11 @@ <para> The openSUSE &suse-version; distribution comes complete with the latest version -of the leading Linux productivity suite, OpenOffice.org. It features a word +of the leading Linux productivity suite, LibreOffice. It features a word processor, spreadsheet application, HTML editor, presentation designer, and database manager. It reads and writes multiple formatsâincluding Microsoft Office formatsâso you can move back and forth easily between openSUSE -and popular non-Linux productivity software. OpenOffice.org is the perfect +and popular non-Linux productivity software. LibreOffice is the perfect choice for reports, papers, home budgets, simple graphics and more.</para> </section> @@ -160,8 +160,8 @@ robust solutions for virtualization available. In addition, openSUSE provides tools for network file sharing (Samba, NFS, etc.), printing (CUPS) and Web hosting (Apache). For application development, openSUSE comes with a complete -set of runtime environments plus extensive application development tools, -including KDevelop, Eclipse and Mono.</para> +set of runtime environments plus extensive application development tools. +</para> </section> @@ -206,17 +206,17 @@ </section> <section label="12_novell"> - <title>Novell and Linux</title> + <title>SUSE and Linux</title> <para> -Novell is committed to your success with Linux. In addition to openSUSE, -Novell also delivers an exciting suite of products designed to meet the +SUSE is committed to your success with Linux. In addition to openSUSE, +SUSE also delivers an exciting suite of products designed to meet the needs of businesses large and small.</para> <para> -The enterprise Linux products from Novell include SUSE Linux Enterprise Server, -SUSE Linux Enterprise Desktop and Novell Open Enterprise Server. Our enterprise +The enterprise Linux products from SUSE include SUSE Linux Enterprise Server and +SUSE Linux Enterprise Desktop. Our enterprise products are delivered with a seven-year maintenance guarantee and optional -support programs. For more information on enterprise Linux from Novell, visit +support programs. For more information on enterprise Linux from SUSE, visit http://www.novell.com/linux </para> -- 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] r64145 - /tags/stable-2_21_6/snapper/
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:57:15 2011 New Revision: 64145 URL: http://svn.opensuse.org/viewcvs/yast?rev=64145&view=rev Log: Created tag stable-2_21_6 for snapper Added: tags/stable-2_21_6/snapper/ - copied from r64144, trunk/snapper/ -- 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] r64144 - in /trunk/snapper: VERSION agent-snapper/doc/snapper.html package/yast2-snapper.changes
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:55:51 2011 New Revision: 64144 URL: http://svn.opensuse.org/viewcvs/yast?rev=64144&view=rev Log: - ask snapper library for snapshot paths - 2.21.6 Modified: trunk/snapper/VERSION trunk/snapper/agent-snapper/doc/snapper.html trunk/snapper/package/yast2-snapper.changes Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=64144&r1=641… ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon May 30 14:55:51 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/snapper/agent-snapper/doc/snapper.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/doc/snappe… ============================================================================== --- trunk/snapper/agent-snapper/doc/snapper.html (original) +++ trunk/snapper/agent-snapper/doc/snapper.html Mon May 30 14:55:51 2011 @@ -56,6 +56,21 @@ </td> </tr> + <tr><td><tt>.snapper.path</td><td>YCPMap</td><td align="left">YCPMap</td> + <td>Return the path to directory with given snapshot<br> + <b>Example of argument map</b>: + <pre> + $[ + "num" : 1, + $] + </pre> + <b>Example of result</b>: + <pre> + "/snapshots/1/snapshot" + </pre> + </td> + </tr> + <tr><td><tt>.snapper.snapshots</td><td>(none)</td><td align="left">YCPList</td> <td>Return list of current snapshot maps.<br> <b>Example of result</b>: Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.ch… ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon May 30 14:55:51 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:55:11 CEST 2011 - jsuchome(a)suse.cz + +- ask snapper library for snapshot paths +- 2.21.6 + +------------------------------------------------------------------- Wed May 11 10:41:42 CEST 2011 - jsuchome(a)suse.cz - added initialization code to agent, check for exceptions -- 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] r64143 - in /trunk/snapper: agent-snapper/src/SnapperAgent.cc src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 30 May '11

30 May '11

Author: jsuchome Date: Mon May 30 14:51:39 2011 New Revision: 64143 URL: http://svn.opensuse.org/viewcvs/yast?rev=64143&view=rev Log: ask snapper library for snapshot paths Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc trunk/snapper/src/Snapper.ycp Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.cc Mon May 30 14:51:39 2011 @@ -148,7 +148,7 @@ if (path->length() == 1) { /** - * error: Read (.snapper.error) -> returns last error message + * Read (.snapper.error) -> returns last error message */ if (PC(0) == "error") { YCPMap retmap; @@ -156,6 +156,21 @@ return retmap; } /** + * Read (.snapper.path, $[ "num" : num]) -> returns the path to directory with given snapshot + */ + if (PC(0) == "path") { + unsigned int num = getIntValue (argmap, "num", 0); + const Snapshots& snapshots = sh->getSnapshots(); + Snapshots::const_iterator snap = snapshots.find(num); + if (snap == snapshots.end()) + { + y2error ("snapshot '%d' not found", num); + return ret; + } + return YCPString (snap->snapshotDir()); + } + + /** * Read(.snapper.snapshots) -> return list of snapshot description maps */ if (PC(0) == "snapshots") { Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=6414… ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Mon May 30 14:51:39 2011 @@ -43,8 +43,6 @@ // global list of all snapshot global list<map> snapshots = []; -global string snapshots_path = "/snapshots"; - global map selected_snapshot = $[]; // mapping of snapshot number to index in snapshots list @@ -70,15 +68,28 @@ } /** + * Return the path to given snapshot + */ +global string GetSnapshotPath (integer snapshot_num) { + string ret = (string) SCR::Read (.snapper.path, $[ "num" : snapshot_num ]); + if (ret == nil) + { + ret = ""; + // popup error + Report::Error (sformat (_("Snapshot '%1' was not found."), snapshot_num)); + } + return ret; +} + +/** * Describe what was done with given file between given snapshots * - when new is 0, meaning is 'current system' */ global map GetFileModification (string file, integer old, integer new) { map ret = $[]; - - string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); + string file1 = sformat ("%1%2", GetSnapshotPath (old), file); + string file2 = sformat ("%1%2", GetSnapshotPath (new), file); if (new == 0) file2 = file; @@ -270,7 +281,7 @@ UI::ChangeWidget (`id (`progress ), `Value, progress); - string orig = sformat ("%1/%2/snapshot", snapshots_path, snapshot_num) + file; + string orig = GetSnapshotPath (snapshot_num) + file; string dir = substring (file, 0, findlastof (file, "/")); if (!FileUtils::Exists (orig)) -- 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] r64142 - in /trunk/online-update-configuration: package/yast2-online-update-configuration.changes src/scripts/online_update
by jdsn＠svn2.opensuse.org 30 May '11

30 May '11

Author: jdsn Date: Mon May 30 14:44:34 2011 New Revision: 64142 URL: http://svn.opensuse.org/viewcvs/yast?rev=64142&view=rev Log: fix proxy settings in automatic online update script, bnc#(678888) make online-update script more robust Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes trunk/online-update-configuration/src/scripts/online_update Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/pack… ============================================================================== --- trunk/online-update-configuration/package/yast2-online-update-configuration.changes (original) +++ trunk/online-update-configuration/package/yast2-online-update-configuration.changes Mon May 30 14:44:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 8 15:56:56 CEST 2011 - jdsn(a)suse.de + +- fix proxy settings in automatic online update script, bnc#(678888) +- make online-update script more robust + +------------------------------------------------------------------- Mon Apr 26 16:57:22 2010 - jdsn(a)suse.de - initial version, split off from yast2-registration (fate#308494) Modified: trunk/online-update-configuration/src/scripts/online_update URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/src/… ============================================================================== --- trunk/online-update-configuration/src/scripts/online_update (original) +++ trunk/online-update-configuration/src/scripts/online_update Mon May 30 14:44:34 2011 @@ -1,5 +1,8 @@ #!/bin/bash +# source the profile to get proper proxy settings, bnc#(678888) +. /etc/profile.d/profile.sh + zyppercmd="/usr/bin/zypper" upcmd="/bin/false" syscfgfile="/etc/sysconfig/automatic_online_update" @@ -21,35 +24,27 @@ fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ ! "x$AOU_ENABLE_CRONJOB" = "xtrue" ] then - if [ ! $AOU_ENABLE_CRONJOB = "true" ] - then - echo "Online Update is disabled in ${syscfgfile}. Will not run update." - exit 0 - fi + echo "Online Update is disabled in ${syscfgfile}. Will not run update." + exit 0 fi -if [ ! -z $AOU_ENABLE_CRONJOB ] + +if [ "x${AOU_SKIP_INTERACTIVE_PATCHES}" = "xtrue" ] then - if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ] - then - skipInteractive="--skip-interactive" - else - skipInteractive= - fi + skipInteractive="--skip-interactive" +else + skipInteractive= fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ "x${AOU_AUTO_AGREE_WITH_LICENSES}" = "xtrue" ] then - if [ ${AOU_AUTO_AGREE_WITH_LICENSES} = "true" ] - then - autoAgreeWithLicenses="--auto-agree-with-licenses" - else - autoAgreeWithLicenses= - fi + autoAgreeWithLicenses="--auto-agree-with-licenses" +else + autoAgreeWithLicenses= fi -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0