Hello community, here is the log from the commit of package yast2-runlevel for openSUSE:Factory checked in at 2013-07-01 16:01:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-runlevel (Old) and /work/SRC/openSUSE:Factory/.yast2-runlevel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-runlevel" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-runlevel/yast2-runlevel.changes 2013-06-05 13:26:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-runlevel.new/yast2-runlevel.changes 2013-07-01 16:01:47.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 12 13:39:07 CEST 2013 - [email protected] + +- Showing the current service status using Service module instead + of reading from /etc/init.d/ which doesn't work (bnc#808317) +- 2.24.1 + +------------------------------------------------------------------- Old: ---- yast2-runlevel-2.24.0.tar.bz2 New: ---- yast2-runlevel-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-runlevel.spec ++++++ --- /var/tmp/diff_new_pack.qz0NxR/_old 2013-07-01 16:01:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qz0NxR/_new 2013-07-01 16:01:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-runlevel -Version: 2.24.0 +Version: 2.24.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-runlevel-2.24.0.tar.bz2 -> yast2-runlevel-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/VERSION new/yast2-runlevel-2.24.1/VERSION --- old/yast2-runlevel-2.24.0/VERSION 2013-05-21 10:11:37.000000000 +0200 +++ new/yast2-runlevel-2.24.1/VERSION 2013-06-12 14:56:22.000000000 +0200 @@ -1 +1 @@ -2.24.0 +2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/configure new/yast2-runlevel-2.24.1/configure --- old/yast2-runlevel-2.24.0/configure 2013-05-28 14:17:28.000000000 +0200 +++ new/yast2-runlevel-2.24.1/configure 2013-06-28 16:14:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-runlevel 2.24.0. +# Generated by GNU Autoconf 2.69 for yast2-runlevel 2.24.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-runlevel' PACKAGE_TARNAME='yast2-runlevel' -PACKAGE_VERSION='2.24.0' -PACKAGE_STRING='yast2-runlevel 2.24.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='yast2-runlevel 2.24.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1249,7 +1249,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-runlevel 2.24.0 to adapt to many kinds of systems. +\`configure' configures yast2-runlevel 2.24.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1320,7 +1320,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-runlevel 2.24.0:";; + short | recursive ) echo "Configuration of yast2-runlevel 2.24.1:";; esac cat <<\_ACEOF @@ -1400,7 +1400,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-runlevel configure 2.24.0 +yast2-runlevel configure 2.24.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1417,7 +1417,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-runlevel $as_me 2.24.0, which was +It was created by yast2-runlevel $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2356,7 +2356,7 @@ # Define the identity of the package. PACKAGE='yast2-runlevel' - VERSION='2.24.0' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -2479,7 +2479,7 @@ -VERSION="2.24.0" +VERSION="2.24.1" RPMNAME="yast2-runlevel" MAINTAINER="Martin Vidner <[email protected]>" @@ -3494,7 +3494,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-runlevel $as_me 2.24.0, which was +This file was extended by yast2-runlevel $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3547,7 +3547,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-runlevel config.status 2.24.0 +yast2-runlevel config.status 2.24.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/configure.in new/yast2-runlevel-2.24.1/configure.in --- old/yast2-runlevel-2.24.0/configure.in 2013-05-28 14:17:25.000000000 +0200 +++ new/yast2-runlevel-2.24.1/configure.in 2013-06-28 16:14:21.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-runlevel dnl -dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-runlevel, 2.24.0, http://bugs.opensuse.org/, yast2-runlevel) +AC_INIT(yast2-runlevel, 2.24.1, http://bugs.opensuse.org/, yast2-runlevel) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.24.0" +VERSION="2.24.1" RPMNAME="yast2-runlevel" MAINTAINER="Martin Vidner <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/src/RunlevelEd.ycp new/yast2-runlevel-2.24.1/src/RunlevelEd.ycp --- old/yast2-runlevel-2.24.0/src/RunlevelEd.ycp 2013-01-22 11:51:49.000000000 +0100 +++ new/yast2-runlevel-2.24.1/src/RunlevelEd.ycp 2013-06-12 13:40:54.000000000 +0200 @@ -490,11 +490,11 @@ /** * Is a service disabled? * Checks whether the default runlevel is in the list of runlevels - * @param service service to check + * @param string service name to check * @return boolean true if service is disabled */ - global define boolean isDisabled (map service) ``{ - return !contains(service["start"]:[], default_runlevel); + global define boolean isDisabled (string service) { + return !Service::Enabled(service); } /** @@ -503,7 +503,7 @@ * @return string name of the first enabled service that requires portmap */ global define string CheckPortmap () ``{ - if (!isDisabled (services["portmap"]:$[])) // if portmap is enabled, there is no problem + if (!isDisabled ("portmap")) // if portmap is enabled, there is no problem return nil; string req = nil; list in = []; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/src/ui.ycp new/yast2-runlevel-2.24.1/src/ui.ycp --- old/yast2-runlevel-2.24.0/src/ui.ycp 2013-01-22 11:51:49.000000000 +0100 +++ new/yast2-runlevel-2.24.1/src/ui.ycp 2013-06-12 13:40:54.000000000 +0200 @@ -160,7 +160,7 @@ // cannot change item which is not listed in the table if (ServiceListedInTable(service_name)) { - boolean disabled = RunlevelEd::isDisabled(RunlevelEd::services[service_name]:$[]); + boolean disabled = RunlevelEd::isDisabled(service_name); UI::ChangeWidget(`id(`table), `Item(service_name, c_bstatus), BstatusText(disabled, started)); } } @@ -428,7 +428,7 @@ { // boot status service_ids_listed_in_table[k] = true; - boolean disabled = RunlevelEd::isDisabled(v); + boolean disabled = RunlevelEd::isDisabled(k); integer started = v["started"]:-1; c_bstatus = col; item = add (item, BstatusText(disabled, started)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.24.0/testsuite/tests/isDisabled.ycp new/yast2-runlevel-2.24.1/testsuite/tests/isDisabled.ycp --- old/yast2-runlevel-2.24.0/testsuite/tests/isDisabled.ycp 2013-01-22 11:51:49.000000000 +0100 +++ new/yast2-runlevel-2.24.1/testsuite/tests/isDisabled.ycp 2013-06-12 14:56:22.000000000 +0200 @@ -13,26 +13,19 @@ "size" : -1, ], ]; - TESTSUITE_INIT ([READ, $[], $[]], nil); + + map EXECUTE = $[ + "target" : $[ + "bash" : 3, + ], + ]; + + TESTSUITE_INIT ([READ, $[], EXECUTE], nil); import "RunlevelEd"; - DUMP (RunlevelEd::isDisabled ($[])); - DUMP (RunlevelEd::isDisabled ( - $[ - "start" : [], - "defstart" : ["1",], - ] - )); - DUMP (RunlevelEd::isDisabled ( - $[ - "start" : [], - "defstart" : [], - ] - )); - DUMP (RunlevelEd::isDisabled ( - $[ - "start" : [ "1", ], - ] - )); + DUMP(RunlevelEd::isDisabled("")); + DUMP(RunlevelEd::isDisabled("service")); + DUMP(RunlevelEd::isDisabled("another-service")); + DUMP(RunlevelEd::isDisabled("yet-another-service")); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
