[yast-commit] [ci_new_pac] JFYI yast2-samba-server -> sle12
![](https://seccdn.libravatar.org/avatar/af626ca29b1318211e3f416634b5db76.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-samba-server -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-samba-server/yast2-samba-server.changes 2014-03-28 16:40:40.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-samba-server/yast2-samba-server.changes 2014-04-22 16:09:20.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 15:49:38 CEST 2014 - locilka@suse.com + +- Deprecated Service method calls replaced with new ones +- 3.1.7 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-samba-server - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-samba-server (Old) and /mounts/work_src_done/SLE12/yast2-samba-server (BS:build ID:36633 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-server", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-samba-server-3.1.6.tar.bz2 New: ---- yast2-samba-server-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.dBN0za/_old 2014-04-23 12:27:34.000000000 +0200 +++ /var/tmp/diff_new_pack.dBN0za/_new 2014-04-23 12:27:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,14 +26,14 @@ Group: System/YaST License: GPL-2.0 -# Service module switched to systemd -BuildRequires: yast2 >= 2.23.15 +# Service.Active +BuildRequires: yast2 >= 3.1.53 BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN samba-client yast2-samba-client perl-XML-Writer update-desktop-files yast2-testsuite yast2-perl-bindings yast2-ldap yast2-users BuildRequires: yast2-devtools >= 3.1.10 Requires: perl-Crypt-SmbHash -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# Service.Active +Requires: yast2 >= 3.1.53 Requires: yast2-ldap >= 3.1.2 Requires: yast2-perl-bindings Requires: yast2-network ++++++ yast2-samba-server-3.1.6.tar.bz2 -> yast2-samba-server-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/package/yast2-samba-server.changes new/yast2-samba-server-3.1.7/package/yast2-samba-server.changes --- old/yast2-samba-server-3.1.6/package/yast2-samba-server.changes 2014-03-28 15:48:27.000000000 +0100 +++ new/yast2-samba-server-3.1.7/package/yast2-samba-server.changes 2014-04-22 16:06:02.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 15:49:38 CEST 2014 - locilka@suse.com + +- Deprecated Service method calls replaced with new ones +- 3.1.7 + +------------------------------------------------------------------- Fri Mar 28 14:38:00 UTC 2014 - vmoravec@suse.com - Fix failing testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/package/yast2-samba-server.spec new/yast2-samba-server-3.1.7/package/yast2-samba-server.spec --- old/yast2-samba-server-3.1.6/package/yast2-samba-server.spec 2014-03-28 15:48:27.000000000 +0100 +++ new/yast2-samba-server-3.1.7/package/yast2-samba-server.spec 2014-04-22 16:06:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,14 +26,14 @@ Group: System/YaST License: GPL-2.0 -# Service module switched to systemd -BuildRequires: yast2 >= 2.23.15 +# Service.Active +BuildRequires: yast2 >= 3.1.53 BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN samba-client yast2-samba-client perl-XML-Writer update-desktop-files yast2-testsuite yast2-perl-bindings yast2-ldap yast2-users BuildRequires: yast2-devtools >= 3.1.10 Requires: perl-Crypt-SmbHash -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# Service.Active +Requires: yast2 >= 3.1.53 Requires: yast2-ldap >= 3.1.2 Requires: yast2-perl-bindings Requires: yast2-network diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/src/modules/SambaService.pm new/yast2-samba-server-3.1.7/src/modules/SambaService.pm --- old/yast2-samba-server-3.1.6/src/modules/SambaService.pm 2014-03-28 15:48:27.000000000 +0100 +++ new/yast2-samba-server-3.1.7/src/modules/SambaService.pm 2014-04-22 16:06:02.000000000 +0200 @@ -51,6 +51,8 @@ # Is smb and nmb service enabled? our $Service = 0; +our @service_names = ("nmb", "smb"); + # Data was modified? BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] } sub GetModified { @@ -89,10 +91,20 @@ sub Write { my ($self) = @_; my $error = 0; + return 1 unless $Modified; + y2debug("Samba service if ". ($Service ? "enabled" : "disabled")); - Service->Adjust("nmb", $Service ? "enable" : "disable") or $error = 1; - Service->Adjust("smb", $Service ? "enable" : "disable") or $error = 1; + if ($Service) { + foreach my $service_name (@service_names) { + Service->Enable($service_name) or $error = 1; + } + } else { + foreach my $service_name (@service_names) { + Service->Disable($service_name) or $error = 1; + } + } + $Modified = 0; return $error == 0; } @@ -118,9 +130,8 @@ BEGIN{$TYPEINFO{GetServiceRunning} = ["function", "boolean"]} sub GetServiceRunning { my $running = 1; - foreach("nmb", "smb") { - # '0' means -> running - if (Service->Status($_)) { + foreach(@service_names) { + if (! Service->Active($_)) { $running = 0; } } @@ -133,35 +144,36 @@ sub StartStopNow { my ($self, $on) = @_; my $error = 0; - + # Zero connected users -> restart, einther -> reload my $connected_users = $self->ConnectedUsers(); - my $run_command = (scalar(@$connected_users)>0 ? "reload":"restart"); + my $nr_connected_users = scalar(@$connected_users); - foreach("nmb", "smb") { + foreach my $service_name (@service_names) { if ($on) { # check, if the services run - if (Service->Status($_)) { + if (Service->Active($service_name)) { # the service does not run => start it - unless (Service->Start($_)) { - y2error("Service::Start($_) failed"); + unless (Service->Start($service_name)) { + y2error("Service::Start($service_name) failed"); $error = 1; } } else { # the service runs => relaod it # RunInitScript return exit code, 0 = OK # Bugzilla #120080 - 'reload' instead of 'restart' - y2milestone("Number of connected users: ".scalar(@$connected_users).", running ".$_." -> ".$run_command); - if (Service->RunInitScript($_, $run_command)) { - y2error("Service::RunInitScript(".$_.", '".$run_command."') failed"); + my $run_command = (($nr_connected_users > 0) ? "Reload":"Restart"); + y2milestone("Number of connected users: ".$nr_connected_users.", running ".$service_name." -> ".$run_command); + if (! Service->$run_command($service_name)) { + y2error("Service::RunInitScript(".$service_name.", '".$run_command."') failed"); $error = 1; } } } else { # turn services off - unless (Service->Status($_)) { - unless (Service->Stop($_)) { - y2error("Service::Stop($_) failed"); + unless (Service->Active($service_name)) { + unless (Service->Stop($service_name)) { + y2error("Service::Stop($service_name) failed"); $error = 1; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-EditService.out new/yast2-samba-server-3.1.7/testsuite/YaPI/tests/YaPI-EditService.out --- old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-EditService.out 2014-03-28 15:48:27.000000000 +0100 +++ new/yast2-samba-server-3.1.7/testsuite/YaPI/tests/YaPI-EditService.out 2014-04-22 16:06:02.000000000 +0200 @@ -1,12 +1,8 @@ Return Enable disabled service -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead Return true Return Disable disabled service Return true Return Enable enabled service -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead Return true Return Disable enabled service Return true continue with "q"... Checked in at Wed Apr 23 12:27:41 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro