Hello community, here is the log from the commit of package yast2-runlevel for openSUSE:Factory checked in at 2013-06-05 13:26:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-10 17:12:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-runlevel.new/yast2-runlevel.changes 2013-06-05 13:26:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 20 16:23:13 CEST 2013 - [email protected] + +- Testsuites adapted to changes in Service module (bnc#807507) +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-runlevel-2.21.9.tar.bz2 New: ---- yast2-runlevel-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-runlevel.spec ++++++ --- /var/tmp/diff_new_pack.EzoJic/_old 2013-06-05 13:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.EzoJic/_new 2013-06-05 13:26:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-runlevel -Version: 2.21.9 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,8 +29,8 @@ BuildRequires: yast2-devtools BuildRequires: yast2-testsuite -# Service module switched to systemd -BuildRequires: yast2 >= 2.23.15 +# Don't use Info function to check enable state (bnc#807507) +BuildRequires: yast2 >= 2.23.23 # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 ++++++ yast2-runlevel-2.21.9.tar.bz2 -> yast2-runlevel-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/Makefile.am new/yast2-runlevel-2.24.0/Makefile.am --- old/yast2-runlevel-2.21.9/Makefile.am 2013-01-10 13:29:47.000000000 +0100 +++ new/yast2-runlevel-2.24.0/Makefile.am 2013-05-28 14:17:25.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/Makefile.am.common new/yast2-runlevel-2.24.0/Makefile.am.common --- old/yast2-runlevel-2.21.9/Makefile.am.common 2013-01-10 13:29:47.000000000 +0100 +++ new/yast2-runlevel-2.24.0/Makefile.am.common 2013-05-28 14:17:25.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/Makefile.in new/yast2-runlevel-2.24.0/Makefile.in --- old/yast2-runlevel-2.21.9/Makefile.in 2013-01-10 13:29:49.000000000 +0100 +++ new/yast2-runlevel-2.24.0/Makefile.in 2013-05-28 14:17:29.000000000 +0200 @@ -982,19 +982,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/VERSION new/yast2-runlevel-2.24.0/VERSION --- old/yast2-runlevel-2.21.9/VERSION 2013-01-10 10:18:22.000000000 +0100 +++ new/yast2-runlevel-2.24.0/VERSION 2013-05-21 10:11:37.000000000 +0200 @@ -1 +1 @@ -2.21.9 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/configure new/yast2-runlevel-2.24.0/configure --- old/yast2-runlevel-2.21.9/configure 2013-01-10 13:29:49.000000000 +0100 +++ new/yast2-runlevel-2.24.0/configure 2013-05-28 14:17:28.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.21.9. +# Generated by GNU Autoconf 2.69 for yast2-runlevel 2.24.0. # # 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.21.9' -PACKAGE_STRING='yast2-runlevel 2.21.9' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-runlevel 2.24.0' 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.21.9 to adapt to many kinds of systems. +\`configure' configures yast2-runlevel 2.24.0 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.21.9:";; + short | recursive ) echo "Configuration of yast2-runlevel 2.24.0:";; 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.21.9 +yast2-runlevel configure 2.24.0 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.21.9, which was +It was created by yast2-runlevel $as_me 2.24.0, 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.21.9' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2479,7 +2479,7 @@ -VERSION="2.21.9" +VERSION="2.24.0" 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.21.9, which was +This file was extended by yast2-runlevel $as_me 2.24.0, 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.21.9 +yast2-runlevel config.status 2.24.0 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.21.9/configure.in new/yast2-runlevel-2.24.0/configure.in --- old/yast2-runlevel-2.21.9/configure.in 2013-01-10 13:29:47.000000000 +0100 +++ new/yast2-runlevel-2.24.0/configure.in 2013-05-28 14:17:25.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-runlevel dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-runlevel, 2.21.9, http://bugs.opensuse.org/, yast2-runlevel) +AC_INIT(yast2-runlevel, 2.24.0, 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.21.9" +VERSION="2.24.0" RPMNAME="yast2-runlevel" MAINTAINER="Martin Vidner <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/src/Makefile.in new/yast2-runlevel-2.24.0/src/Makefile.in --- old/yast2-runlevel-2.21.9/src/Makefile.in 2013-01-10 13:29:49.000000000 +0100 +++ new/yast2-runlevel-2.24.0/src/Makefile.in 2013-05-28 14:17:29.000000000 +0200 @@ -711,7 +711,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/testsuite/tests/saveServices.out new/yast2-runlevel-2.24.0/testsuite/tests/saveServices.out --- old/yast2-runlevel-2.21.9/testsuite/tests/saveServices.out 2013-01-07 10:52:06.000000000 +0100 +++ new/yast2-runlevel-2.24.0/testsuite/tests/saveServices.out 2013-05-21 10:11:37.000000000 +0200 @@ -5,33 +5,21 @@ Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Log Cannot enable service a (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled a.service" 0 Log Cannot enable service b (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled b.service" 0 Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Log Cannot enable service a (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled a.service" 0 Log Cannot enable service b (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled b.service" 0 Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Log Cannot enable service a (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled a.service" 0 Log Cannot enable service b (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled b.service" 0 Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Execute .target.bash_output "/bin/systemctl --force disable a.service" $["exit":0, "stderr":"", "stdout":""] @@ -41,7 +29,5 @@ Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Log Cannot enable service nfsserver (just) in selected runlevels, enabling in all default ones -Read .init.scripts.runlevel "nfsserver" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] -Read .init.scripts.comment "nfsserver" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/bin/systemctl enable nfsserver.service" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash "/bin/systemctl is-enabled nfsserver.service" 0 Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-2.21.9/testsuite/tests/saveServices.ycp new/yast2-runlevel-2.24.0/testsuite/tests/saveServices.ycp --- old/yast2-runlevel-2.21.9/testsuite/tests/saveServices.ycp 2013-01-07 10:52:06.000000000 +0100 +++ new/yast2-runlevel-2.24.0/testsuite/tests/saveServices.ycp 2013-05-21 10:11:37.000000000 +0200 @@ -14,27 +14,12 @@ "exists": true, "default_runlevel" : "5", "current_runlevel" : "5", - "runlevel" : $[ - "service" : $[ - "start" : [ "0", "1", "3" ], - "stop" : [ "4", "5", "6" ], - ], - ], - "comment" : $[ - "service" : $[ - "defstart" : [ "0", "1", "3" ], - "defstop" : [ "4", "5", "6" ], - ], - ], ], ], - "target" : $[ - "size" : -1, - ], "target" : $[ "stat" : $[ "isreg" : true ], "size" : 0, - ] + ] ]; TESTSUITE_INIT ([READ, $[], $[]], nil); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
