Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2013-11-26 19:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2013-11-15 14:24:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2013-11-26 19:35:45.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 25 15:48:26 CET 2013 - [email protected] + +- Switched to using Service library instead of calling init script + directly +- 3.1.2 + +------------------------------------------------------------------- @@ -4,0 +12 @@ +- 3.1.1 Old: ---- yast2-dns-server-3.1.1.tar.bz2 New: ---- yast2-dns-server-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.CAqZGO/_old 2013-11-26 19:35:45.000000000 +0100 +++ /var/tmp/diff_new_pack.CAqZGO/_new 2013-11-26 19:35:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-dns-server-3.1.1.tar.bz2 -> yast2-dns-server-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/VERSION new/yast2-dns-server-3.1.2/VERSION --- old/yast2-dns-server-3.1.1/VERSION 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/VERSION 2013-11-26 16:22:48.000000000 +0100 @@ -1 +1 @@ -3.1.1 +3.1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/package/yast2-dns-server.changes new/yast2-dns-server-3.1.2/package/yast2-dns-server.changes --- old/yast2-dns-server-3.1.1/package/yast2-dns-server.changes 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/package/yast2-dns-server.changes 2013-11-26 16:22:48.000000000 +0100 @@ -1,7 +1,15 @@ ------------------------------------------------------------------- +Mon Nov 25 15:48:26 CET 2013 - [email protected] + +- Switched to using Service library instead of calling init script + directly +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - [email protected] - Add explicit COPYING file +- 3.1.1 ------------------------------------------------------------------- Wed Sep 18 15:53:18 UTC 2013 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/package/yast2-dns-server.spec new/yast2-dns-server-3.1.2/package/yast2-dns-server.spec --- old/yast2-dns-server-3.1.1/package/yast2-dns-server.spec 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/package/yast2-dns-server.spec 2013-11-26 16:22:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/src/modules/DnsServer.pm new/yast2-dns-server-3.1.2/src/modules/DnsServer.pm --- old/yast2-dns-server-3.1.1/src/modules/DnsServer.pm 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/src/modules/DnsServer.pm 2013-11-26 16:22:48.000000000 +0100 @@ -806,38 +806,32 @@ BEGIN{$TYPEINFO{StopDnsService} = ["function", "boolean"];} sub StopDnsService { - my $self = shift; - - my $ret = SCR->Execute (".target.bash", "/etc/init.d/named stop"); - if ($ret == 0) + if (Service->Stop("named")) { return 1; } + y2error ("Stopping DNS daemon failed"); return 0; } BEGIN{$TYPEINFO{GetDnsServiceStatus} = ["function", "boolean"];} sub GetDnsServiceStatus { - my $self = shift; - - my $ret = SCR->Execute (".target.bash", "/etc/init.d/named status"); - if ($ret == 0) + if (Service->Status("named") == 0) { return 1; } + return 0; } BEGIN{$TYPEINFO{StartDnsService} = ["function", "boolean"];} sub StartDnsService { - my $self = shift; - - my $ret = SCR->Execute (".target.bash", "/etc/init.d/named restart"); - if ($ret == 0) + if (Service->Restart("named")) { return 1; } + y2error ("Starting DNS daemon failed"); return 0; } @@ -1277,8 +1271,6 @@ "" ); - my $sl = 0; - Progress->NextStage (); my $ok = 1; @@ -1392,12 +1384,12 @@ $ok = $self->ZoneWrite ($z) && $ok; } - my $ret = 0; + my $ret = 1; if (scalar (@zones_update_actions) > 0) { # named is running - if (Service->Status("named")==0) { - $ret = SCR->Execute (".target.bash", "/etc/init.d/named reload"); + if (Service->Status("named") == 0) { + $ret = Service->Reload("named"); } } @@ -1405,7 +1397,7 @@ if (scalar (@zones_update_actions) > 0) { - if ($ret != 0) + if (! $ret) { $ok = 0; } @@ -1428,7 +1420,7 @@ # update forwarders.conf y2milestone("Calling netconfig"); $ret->{'exit'} = 0; - $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update"); + $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update -m dns"); if ($ret->{'exit'} != 0) { Report->Error (__("Error occurred while calling netconfig.\nError: ".$ret->{'stdout'})); @@ -1440,25 +1432,25 @@ # named has to be started if ($start_service) { - $ret->{'exit'} = 0; + my $success = 1; if (! $write_only) { # named is running - if (Service->Status("named")==0) { + if (Service->Status("named") == 0) { y2milestone("Reloading service 'named'"); - $ret = SCR->Execute (".target.bash_output", "/etc/init.d/named reload"); + $success = Service->Reload("named") } else { y2milestone("Restarting service 'named'"); - $ret = SCR->Execute (".target.bash_output", "/etc/init.d/named restart"); + $success = Service->Restart("named") } # 'named' is running. Set dns forwarder to 'bind'. - $forwarder="bind"; + $forwarder = "bind"; } Service->Enable ("named"); - if ($ret->{'exit'} != 0) + if (! $success) { # Cannot start service 'named', because of error that follows Error:. Do not translate named. - Report->Error (__("Error occurred while starting service named.\nError: ".$ret->{'stdout'})); + Report->Error (__("Error occurred while starting service named.\n\n".Service->FullInfo("named"))); $ok = 0; # There's no 'named' running. Reset dns forwarder again $forwarder = "resolver"; @@ -1470,7 +1462,7 @@ if (! $write_only) { y2milestone("Stopping service 'named'"); - SCR->Execute (".target.bash", "/etc/init.d/named stop"); + Service->Stop("named"); # There's no 'named' running. Reset dns forwarder again $forwarder = "resolver"; } @@ -1495,7 +1487,7 @@ y2milestone("Calling netconfig"); $ret->{'exit'} = 0; - $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update"); + $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update -m dns"); if ($ret->{'exit'} != 0) { Report->Error (__("Error occurred while calling netconfig.\nError: ".$ret->{'stdout'})); } @@ -1509,7 +1501,6 @@ Progress->set ($progress_orig); Progress->NextStage (); - sleep ($sl); return $ok; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/DnsServerAPI.out new/yast2-dns-server-3.1.2/testsuite/tests/DnsServerAPI.out --- old/yast2-dns-server-3.1.1/testsuite/tests/DnsServerAPI.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/DnsServerAPI.out 2013-11-26 16:22:48.000000000 +0100 @@ -7,9 +7,6 @@ Return 93603S Return 14641M Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 0 -Execute .target.bash "/etc/init.d/named stop" 0 -Execute .target.bash "/etc/init.d/named restart" 0 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/Read.out new/yast2-dns-server-3.1.2/testsuite/tests/Read.out --- old/yast2-dns-server-3.1.1/testsuite/tests/Read.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/Read.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,6 +1,4 @@ Dump ======================= -Execute .target.bash "/etc/init.d/named status" 1 -Execute .target.bash "/etc/init.d/named stop" 1 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/Write.out new/yast2-dns-server-3.1.2/testsuite/tests/Write.out --- old/yast2-dns-server-3.1.1/testsuite/tests/Write.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/Write.out 2013-11-26 16:22:48.000000000 +0100 @@ -37,10 +37,9 @@ Write .dns.named.value."zone \"example.com\" in".type ["master"] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":0, "stdout":"20030806"] -Execute .target.bash "/etc/init.d/named stop" 0 +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stdout":"20030806"] Write .target.ycp "/var/lib/YaST2/dns_server" $[] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":0, "stdout":"20030806"] +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":0, "stdout":"20030806"] Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIReadGlobalOptions.out new/yast2-dns-server-3.1.2/testsuite/tests/YaPIReadGlobalOptions.out --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIReadGlobalOptions.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIReadGlobalOptions.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,7 +1,4 @@ Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 0 -Execute .target.bash "/etc/init.d/named stop" 0 -Execute .target.bash "/etc/init.d/named restart" 0 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIReadZones.out new/yast2-dns-server-3.1.2/testsuite/tests/YaPIReadZones.out --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIReadZones.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIReadZones.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,7 +1,4 @@ Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 0 -Execute .target.bash "/etc/init.d/named stop" 0 -Execute .target.bash "/etc/init.d/named restart" 0 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIStartStopDnsService.out new/yast2-dns-server-3.1.2/testsuite/tests/YaPIStartStopDnsService.out --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIStartStopDnsService.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIStartStopDnsService.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,10 +1,7 @@ Dump ========================================================== -Execute .target.bash "/etc/init.d/named restart" 0 Return true Dump ========================================================== -Execute .target.bash "/etc/init.d/named stop" 0 Return true Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 0 Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIStartStopDnsService.rb new/yast2-dns-server-3.1.2/testsuite/tests/YaPIStartStopDnsService.rb --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIStartStopDnsService.rb 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIStartStopDnsService.rb 2013-11-26 16:22:48.000000000 +0100 @@ -95,7 +95,15 @@ } } @I_WRITE = {} - @I_EXEC = {} + @I_EXEC = { + "target" => { + "bash_output" => { + "exit" => 0, + "stdout" => "[OK]", + "stderr" => "", + } + } + } TESTSUITE_INIT([@I_READ, @I_WRITE, @I_EXEC], nil) @@ -105,11 +113,11 @@ Mode.SetMode("test") DUMP("==========================================================") - TEST(lambda { YaPI::DNSD.StartDnsService({}) }, [], nil) + TEST(lambda { YaPI::DNSD.StartDnsService({}) }, [@I_READ, @I_WRITE, @I_EXEC], nil) DUMP("==========================================================") - TEST(lambda { YaPI::DNSD.StopDnsService({}) }, [], nil) + TEST(lambda { YaPI::DNSD.StopDnsService({}) }, [@I_READ, @I_WRITE, @I_EXEC], nil) DUMP("==========================================================") - TEST(lambda { YaPI::DNSD.GetDnsServiceStatus({}) }, [], nil) + TEST(lambda { YaPI::DNSD.GetDnsServiceStatus({}) }, [@I_READ, @I_WRITE, @I_EXEC], nil) DUMP("==========================================================") nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIWriteGlobalOptions.out new/yast2-dns-server-3.1.2/testsuite/tests/YaPIWriteGlobalOptions.out --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIWriteGlobalOptions.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIWriteGlobalOptions.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,6 +1,4 @@ Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 1 -Execute .target.bash "/etc/init.d/named stop" 1 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil @@ -49,11 +47,10 @@ Write .sysconfig.named nil true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] -Execute .target.bash "/etc/init.d/named stop" 1 +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":1, "stderr":"", "stdout":""] Write .target.ycp "/var/lib/YaST2/dns_server" $[] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":1, "stderr":"", "stdout":""] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.1/testsuite/tests/YaPIWriteZones.out new/yast2-dns-server-3.1.2/testsuite/tests/YaPIWriteZones.out --- old/yast2-dns-server-3.1.1/testsuite/tests/YaPIWriteZones.out 2013-11-15 12:57:39.000000000 +0100 +++ new/yast2-dns-server-3.1.2/testsuite/tests/YaPIWriteZones.out 2013-11-26 16:22:48.000000000 +0100 @@ -1,6 +1,4 @@ Dump ========================================================== -Execute .target.bash "/etc/init.d/named status" 1 -Execute .target.bash "/etc/init.d/named stop" 1 Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil @@ -55,11 +53,10 @@ Write .dns.named.value."zone \"example.com\" in".type ["master"] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] -Execute .target.bash "/etc/init.d/named stop" 1 +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":1, "stderr":"", "stdout":""] Write .target.ycp "/var/lib/YaST2/dns_server" $[] true Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true Write .sysconfig.network.config nil true -Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/netconfig update -m dns" $["exit":1, "stderr":"", "stdout":""] Return true Dump ========================================================== -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
