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-inetd -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-inetd/yast2-inetd.changes 2014-03-28 16:30:05.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-inetd/yast2-inetd.changes 2014-05-05 13:50:48.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 13:21:51 CEST 2014 - locilka@suse.com + +- Replaced obsolete Service.* calls with new ones +- Inetd.netd_status* are now boolean values +- Adapted testsuite +- 3.1.5 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ftp-server - yast2-inetd - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-inetd (Old) and /mounts/work_src_done/SLE12/yast2-inetd (BS:build ID:37366 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-inetd", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-inetd-3.1.4.tar.bz2 New: ---- yast2-inetd-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.M0MCNH/_old 2014-05-05 14:54:36.000000000 +0200 +++ /var/tmp/diff_new_pack.M0MCNH/_new 2014-05-05 14:54:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.4 +Version: 3.1.5 Release: 0 Url: https://github.com/yast/yast-inetd ++++++ yast2-inetd-3.1.4.tar.bz2 -> yast2-inetd-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/package/yast2-inetd.changes new/yast2-inetd-3.1.5/package/yast2-inetd.changes --- old/yast2-inetd-3.1.4/package/yast2-inetd.changes 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/package/yast2-inetd.changes 2014-05-05 13:50:40.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 5 13:21:51 CEST 2014 - locilka@suse.com + +- Replaced obsolete Service.* calls with new ones +- Inetd.netd_status* are now boolean values +- Adapted testsuite +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 28 09:56:24 UTC 2014 - vmoravec@suse.com - Fix failing testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/package/yast2-inetd.spec new/yast2-inetd-3.1.5/package/yast2-inetd.spec --- old/yast2-inetd-3.1.4/package/yast2-inetd.spec 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/package/yast2-inetd.spec 2014-05-05 13:50:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.4 +Version: 3.1.5 Release: 0 Url: https://github.com/yast/yast-inetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/clients/inetd_auto.rb new/yast2-inetd-3.1.5/src/clients/inetd_auto.rb --- old/yast2-inetd-3.1.4/src/clients/inetd_auto.rb 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/clients/inetd_auto.rb 2014-05-05 13:50:40.000000000 +0200 @@ -100,7 +100,7 @@ @po = Progress.set(false) @ret = Inetd.Read Progress.set(@po) - Inetd.netd_status = Service.Status("xinetd") + Inetd.netd_status = Service.active?("xinetd") Inetd.netd_conf = Builtins.maplist(Inetd.netd_conf) do |s| Builtins.add(s, "changed", true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/include/inetd/dialogs.rb new/yast2-inetd-3.1.5/src/include/inetd/dialogs.rb --- old/yast2-inetd-3.1.4/src/include/inetd/dialogs.rb 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/include/inetd/dialogs.rb 2014-05-05 13:50:40.000000000 +0200 @@ -426,7 +426,7 @@ new_state = false # if service active, enable editting - new_state = true if Inetd.netd_status == 0 + new_state = Inetd.netd_status UI.ChangeWidget(Id(:editable), :Value, new_state) UI.ChangeWidget(Id(:table), :Enabled, new_state) UI.ChangeWidget(Id(:create), :Enabled, new_state) @@ -468,11 +468,7 @@ UI.ChangeWidget(Id(:toggle_menu), :Enabled, new_state2) UI.ChangeWidget(Id(:switch_active), :Enabled, new_state2) - if new_state2 - Inetd.netd_status = 0 - else - Inetd.netd_status = -1 - end + Inetd.netd_status = new_state2 # create new entry elsif ret == :create selected_item = Convert.to_string( @@ -779,8 +775,8 @@ end if ret == :next - if Inetd.netd_status == 0 && IsAnyServiceEnabled(Inetd.netd_conf) == :no - Inetd.netd_status = -1 + if Inetd.netd_status && IsAnyServiceEnabled(Inetd.netd_conf) == :no + Inetd.netd_status = false # Translators: Popup::Warning Popup.Warning( _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/include/inetd/routines.rb new/yast2-inetd-3.1.5/src/include/inetd/routines.rb --- old/yast2-inetd-3.1.4/src/include/inetd/routines.rb 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/include/inetd/routines.rb 2014-05-05 13:50:40.000000000 +0200 @@ -30,6 +30,8 @@ # $Id$ module Yast module InetdRoutinesInclude + TCPD_BINARY = "/usr/sbin/tcpd" + def initialize_inetd_routines(include_target) Yast.import "UI" @@ -68,27 +70,26 @@ nil end - # Used for cpmparisons whether the servers match: + # Used for comparisons whether the servers match: # If server is /usr/sbin/tcpd, consider server_args instead. - # Then take the firse word (strips arguments or the parenthesized pkg name). + # Then take the first word (strips arguments or the parenthesized pkg name). # Then take the last slash-delimited component. # For sparse matching: nil is returned if server is nil # (or if server args is nil AND is needed) + # # @param [String] server "server" field of a service # @param [String] server_args "server_args" field of a service # @return basename of the real server def GetServerBasename(server, server_args) - result = server - # discard tcpd - result = server_args if result == "/usr/sbin/tcpd" + result = (server == TCPD_BINARY ? server_args : server).dup + # check nil - if result != nil - # program only - result = String.FirstChunk(result, " \t") - # basename - comp = Builtins.splitstring(result, "/") - result = Ops.get(comp, Ops.subtract(Builtins.size(comp), 1), "") + if result && !result.empty? + # find the server name + server_path = result.strip.split(/[ \t]/).first + result = File.basename(server_path) end + result end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/modules/Inetd.rb new/yast2-inetd-3.1.5/src/modules/Inetd.rb --- old/yast2-inetd-3.1.4/src/modules/Inetd.rb 2014-03-28 14:33:23.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/modules/Inetd.rb 2014-05-05 13:50:40.000000000 +0200 @@ -157,7 +157,7 @@ # Is xinetd running? # These variables contains return values from Service::Status() calls. - @netd_status = -1 + @netd_status = false @netd_status_read = @netd_status # This variable is used for new iid "generator" @@ -205,7 +205,7 @@ :to => "list