Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-01-21 07:01:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-01-16 10:19:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-01-21 07:01:37.000000000 +0100 @@ -2 +2 @@ -Wed Jan 16 08:20:22 UTC 2013 - [email protected] +Thu Jan 17 17:00:06 CET 2013 - [email protected] @@ -4 +4,8 @@ -- hotfix for b1 to be reverted later +- Extended checking for service in Service module by also checking + in /etc/init.d as a fallback (bnc#795929 comment#20). +- 2.23.19 + +------------------------------------------------------------------- +Wed Jan 16 10:57:28 CET 2013 - [email protected] + +- Testcase for Service module moved here from yast2-iscsi-client Old: ---- use-systemctrl_options.diff yast2-2.23.18.tar.bz2 New: ---- yast2-2.23.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.l5TnOk/_old 2013-01-21 07:01:39.000000000 +0100 +++ /var/tmp/diff_new_pack.l5TnOk/_new 2013-01-21 07:01:39.000000000 +0100 @@ -17,14 +17,13 @@ Name: yast2 -Version: 2.23.18 +Version: 2.23.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-%{version}.tar.bz2 Source1: yast2-rpmlintrc -Patch0: use-systemctrl_options.diff BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files @@ -145,7 +144,6 @@ %prep %setup -n yast2-%{version} -%patch0 -p1 %build %{_prefix}/bin/y2tool y2autoconf @@ -164,7 +162,7 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -#[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} ++++++ yast2-2.23.18.tar.bz2 -> yast2-2.23.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/Makefile.in new/yast2-2.23.19/Makefile.in --- old/yast2-2.23.18/Makefile.in 2013-01-14 16:51:34.000000000 +0100 +++ new/yast2-2.23.19/Makefile.in 2013-01-18 10:13:29.000000000 +0100 @@ -687,7 +687,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/VERSION new/yast2-2.23.19/VERSION --- old/yast2-2.23.18/VERSION 2013-01-14 11:19:26.000000000 +0100 +++ new/yast2-2.23.19/VERSION 2013-01-17 16:59:55.000000000 +0100 @@ -1 +1 @@ -2.23.18 +2.23.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/configure new/yast2-2.23.19/configure --- old/yast2-2.23.18/configure 2013-01-14 16:51:34.000000000 +0100 +++ new/yast2-2.23.19/configure 2013-01-18 10:13:29.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2 2.23.18. +# Generated by GNU Autoconf 2.69 for yast2 2.23.19. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.23.18' -PACKAGE_STRING='yast2 2.23.18' +PACKAGE_VERSION='2.23.19' +PACKAGE_STRING='yast2 2.23.19' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,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 2.23.18 to adapt to many kinds of systems. +\`configure' configures yast2 2.23.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.23.18:";; + short | recursive ) echo "Configuration of yast2 2.23.19:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.23.18 +yast2 configure 2.23.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,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 $as_me 2.23.18, which was +It was created by yast2 $as_me 2.23.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.23.18' + VERSION='2.23.19' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.23.18" +VERSION="2.23.19" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3522,7 +3522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.23.18, which was +This file was extended by yast2 $as_me 2.23.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,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 config.status 2.23.18 +yast2 config.status 2.23.19 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-2.23.18/configure.in new/yast2-2.23.19/configure.in --- old/yast2-2.23.18/configure.in 2013-01-14 16:51:31.000000000 +0100 +++ new/yast2-2.23.19/configure.in 2013-01-18 10:13:25.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.23.18, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.23.19, http://bugs.opensuse.org/, yast2) 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.23.18" +VERSION="2.23.19" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/control/src/ProductControl.ycp new/yast2-2.23.19/library/control/src/ProductControl.ycp --- old/yast2-2.23.18/library/control/src/ProductControl.ycp 2012-11-26 10:43:15.000000000 +0100 +++ new/yast2-2.23.19/library/control/src/ProductControl.ycp 2013-01-15 16:41:37.000000000 +0100 @@ -409,7 +409,7 @@ // BNC #401319 // 'execute; is defined and thus returned - if (execute != "" && execute != "") { + if (execute != nil && execute != "") { y2milestone ("Step name '%1' executes '%2'", name, execute); return execute; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/modules/Version.ycp new/yast2-2.23.19/library/modules/Version.ycp --- old/yast2-2.23.18/library/modules/Version.ycp 2013-01-14 16:51:38.000000000 +0100 +++ new/yast2-2.23.19/library/modules/Version.ycp 2013-01-18 10:13:34.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.23.18"; +global string yast2 = "2.23.19"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/runlevel/src/Service.ycp new/yast2-2.23.19/library/runlevel/src/Service.ycp --- old/yast2-2.23.18/library/runlevel/src/Service.ycp 2013-01-14 16:34:22.000000000 +0100 +++ new/yast2-2.23.19/library/runlevel/src/Service.ycp 2013-01-18 10:10:34.000000000 +0100 @@ -77,6 +77,11 @@ list <string> systemd_dirs = ["/usr/lib/systemd/system", "/run/systemd/system", "/etc/systemd/system"]; /** + * Init.d scripts location + */ +const string INITD_DIR = "/etc/init.d"; + +/** * After a function returns an error, this holds an error message, * including insserv stderr and possibly containing newlines. * @@ -105,18 +110,26 @@ boolean service_exists = false; + list <string> possible_service_locations = add ( + // all known $service.service locations + maplist(string directory, systemd_dirs, ``(sformat("%1/%2.service", directory, name))), + // init.d fallback, see bnc#795929 comment#20 + sformat("%1/%2", INITD_DIR, name) + ); - string target_dir = find(string directory, systemd_dirs, - ``(FileUtils::Exists(sformat("%1/%2.service", directory, name))) + string target_dir = find(string service_file, possible_service_locations, + ``(FileUtils::Exists(service_file)) ); if (target_dir != nil) { return true; } else { + list <string> possible_locations = add(systemd_dirs, INITD_DIR); // Error message. // %1 is a name of an init script in /usr/lib/systemd/system, // eg. nfsserver - error_msg = sformat (_("Service %1 does not exist in %2."), name, mergestring(systemd_dirs, ", ")); + error_msg = sformat (_("Service %1 does not exist in %2."), + name, mergestring(possible_locations, ", ")); y2milestone (1, error_msg); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/runlevel/testsuite/tests/GetSetServiceStatus.out new/yast2-2.23.19/library/runlevel/testsuite/tests/GetSetServiceStatus.out --- old/yast2-2.23.18/library/runlevel/testsuite/tests/GetSetServiceStatus.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.23.19/library/runlevel/testsuite/tests/GetSetServiceStatus.out 2013-01-16 10:56:55.000000000 +0100 @@ -0,0 +1,16 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true] +Execute .target.bash "/bin/systemctl is-enabled iscsid.service" 0 +Return true +Read .target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true] +Read .target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true] +Read .target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true] +Read .init.scripts.runlevel "boot.iscsid-early" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "boot.iscsid-early" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] +Return true +Read .target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true] +Read .target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true] +Read .target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true] +Read .init.scripts.runlevel "iscsid" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "iscsid" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] +Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/runlevel/testsuite/tests/GetSetServiceStatus.ycp new/yast2-2.23.19/library/runlevel/testsuite/tests/GetSetServiceStatus.ycp --- old/yast2-2.23.18/library/runlevel/testsuite/tests/GetSetServiceStatus.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.23.19/library/runlevel/testsuite/tests/GetSetServiceStatus.ycp 2013-01-16 10:56:55.000000000 +0100 @@ -0,0 +1,26 @@ +{ + include "testsuite.ycp"; + + map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "stat" : $["isreg" : true] + ], + "init" :$[ + "scripts" :$[ + "exists" : true, + "runlevel" : $[ "iscsid":$["start":["3","5"], "stop":["3", "5"]], "boot.iscsid-early":$["start":["B"], "stop":[]] ], + "comment" : $["iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]], + ] + ] + ]; + TESTSUITE_INIT ([READ, $[], $[]], nil); + + import "Service"; + + + TEST( ``{ return Service::Enabled("iscsid");}, [ READ, $[], $[] ], nil ); + TEST( ``{ return Service::Enable("boot.iscsid-early");}, [ READ, $[], $[] ], nil ); + TEST( ``{ return Service::Enable("iscsid");}, [ READ, $[], $[] ], nil ); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.18/library/runlevel/testsuite/tests/ServiceAdjust.out new/yast2-2.23.19/library/runlevel/testsuite/tests/ServiceAdjust.out --- old/yast2-2.23.18/library/runlevel/testsuite/tests/ServiceAdjust.out 2013-01-14 15:52:16.000000000 +0100 +++ new/yast2-2.23.19/library/runlevel/testsuite/tests/ServiceAdjust.out 2013-01-17 16:43:05.000000000 +0100 @@ -2,6 +2,7 @@ Read .target.stat "/usr/lib/systemd/system/aaa.service" $[] Read .target.stat "/run/systemd/system/aaa.service" $[] Read .target.stat "/etc/systemd/system/aaa.service" $[] +Read .target.stat "/etc/init.d/aaa" $[] Log Service aaa does not exist. Return false Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
