Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2013-03-17 10:08:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "yast2-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-03-14
15:36:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-03-17
10:08:34.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 15 16:35:14 CET 2013 - jsuch...@suse.cz
+
+- testsuite adapted to previous change (new code in Enable call)
+
+-------------------------------------------------------------------
+Wed Mar 6 10:07:05 CET 2013 - tgoettlic...@suse.de
+
+- applied lnussel's patch:
+ Don't use Info function to check enable state (bnc#807507)
+- 2.23.23
+
+-------------------------------------------------------------------
Old:
----
yast2-2.23.22.tar.bz2
New:
----
yast2-2.23.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.oJouNP/_old 2013-03-17 10:08:36.000000000 +0100
+++ /var/tmp/diff_new_pack.oJouNP/_new 2013-03-17 10:08:36.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 2.23.22
+Version: 2.23.23
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-2.23.22.tar.bz2 -> yast2-2.23.23.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.22/VERSION new/yast2-2.23.23/VERSION
--- old/yast2-2.23.22/VERSION 2013-03-06 10:27:40.000000000 +0100
+++ new/yast2-2.23.23/VERSION 2013-03-15 16:16:40.000000000 +0100
@@ -1 +1 @@
-2.23.22
+2.23.23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.22/configure new/yast2-2.23.23/configure
--- old/yast2-2.23.22/configure 2013-03-06 10:27:51.000000000 +0100
+++ new/yast2-2.23.23/configure 2013-03-15 18:01:57.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.22.
+# Generated by GNU Autoconf 2.69 for yast2 2.23.23.
#
# 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.22'
-PACKAGE_STRING='yast2 2.23.22'
+PACKAGE_VERSION='2.23.23'
+PACKAGE_STRING='yast2 2.23.23'
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.22 to adapt to many kinds of systems.
+\`configure' configures yast2 2.23.23 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.22:";;
+ short | recursive ) echo "Configuration of yast2 2.23.23:";;
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.22
+yast2 configure 2.23.23
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.22, which was
+It was created by yast2 $as_me 2.23.23, 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.22'
+ VERSION='2.23.23'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2480,7 @@
-VERSION="2.23.22"
+VERSION="2.23.23"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers <yast2-maintain...@suse.de>"
@@ -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.22, which was
+This file was extended by yast2 $as_me 2.23.23, 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.22
+yast2 config.status 2.23.23
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.22/configure.in
new/yast2-2.23.23/configure.in
--- old/yast2-2.23.22/configure.in 2013-03-06 10:27:47.000000000 +0100
+++ new/yast2-2.23.23/configure.in 2013-03-15 18:01:53.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.22, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.23.23, 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.22"
+VERSION="2.23.23"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers <yast2-maintain...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.22/library/modules/Version.ycp
new/yast2-2.23.23/library/modules/Version.ycp
--- old/yast2-2.23.22/library/modules/Version.ycp 2013-03-06
10:27:58.000000000 +0100
+++ new/yast2-2.23.23/library/modules/Version.ycp 2013-03-15
18:02:03.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.23.22";
+global string yast2 = "2.23.23";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-2.23.22/library/runlevel/src/Service.ycp
new/yast2-2.23.23/library/runlevel/src/Service.ycp
--- old/yast2-2.23.22/library/runlevel/src/Service.ycp 2013-03-06
10:27:40.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/src/Service.ycp 2013-03-15
16:16:40.000000000 +0100
@@ -185,11 +185,26 @@
}
/**
+ * Check if service is enabled (in any runlevel)
+ *
+ * Forwards to chkconfig -l which decides between init and systemd
+ *
+ * @param name service name
+ * @return true if service is set to run in any runlevel
+ */
+global define boolean Enabled (string name) {
+ if(!checkExists (name)) return false;
+
+ return (SCR::Execute (.target.bash, sformat ("%1 is-enabled %2.service",
invoker, name)) == 0);
+}
+
+/**
* Get service info without peeking if service runs.
* @param name name of the service
* @return Service information or empty map ($[])
*/
global define map Info (string name) {
+ y2error("### Calling Service::Info is broken with systemd! ###");
if(!checkExists (name)) return $[];
map read = (map) SCR::Read (.init.scripts.runlevel, name);
map detail = read[name]:$[];
@@ -268,8 +283,7 @@
return false;
}
- map service = Info (name);
- boolean is_enabled = size (service["start"]:[]) != 0;
+ boolean is_enabled = Enabled(name);
if (action == "disable") {
if (is_enabled)
@@ -332,20 +346,6 @@
}
/**
- * Check if service is enabled (in any runlevel)
- *
- * Forwards to chkconfig -l which decides between init and systemd
- *
- * @param name service name
- * @return true if service is set to run in any runlevel
- */
-global define boolean Enabled (string name) {
- if(!checkExists (name)) return false;
-
- return (SCR::Execute (.target.bash, sformat ("%1 is-enabled %2.service",
invoker, name)) == 0);
-}
-
-/**
* Run init script.
* @param name init service name
* @param param init script argument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-2.23.22/library/runlevel/testsuite/tests/GetSetServiceStatus.out
new/yast2-2.23.23/library/runlevel/testsuite/tests/GetSetServiceStatus.out
--- old/yast2-2.23.22/library/runlevel/testsuite/tests/GetSetServiceStatus.out
2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/testsuite/tests/GetSetServiceStatus.out
2013-03-15 18:01:45.000000000 +0100
@@ -5,12 +5,10 @@
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":[]]]
+Execute .target.bash "/bin/systemctl is-enabled
boot.iscsid-early.service" 0
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":[]]]
+Execute .target.bash "/bin/systemctl is-enabled iscsid.service" 0
Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceAdjust.out
new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceAdjust.out
--- old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceAdjust.out
2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceAdjust.out
2013-03-15 18:01:45.000000000 +0100
@@ -7,35 +7,29 @@
Return false
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"],
"stop":["4", "5", "6"]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Execute .target.bash_output "/bin/systemctl disable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":[], "stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
+Execute .target.bash_output "/bin/systemctl disable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":[], "stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
-Execute .target.bash_output "/bin/systemctl enable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":["1"], "stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":["1"], "stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Execute .target.bash_output "/bin/systemctl enable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"],
"stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Execute .target.bash_output "/bin/systemctl enable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceFinetune.out
new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceFinetune.out
--- old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceFinetune.out
2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceFinetune.out
2013-03-15 18:01:45.000000000 +0100
@@ -3,9 +3,7 @@
Log Cannot enable service aaa (just) in selected runlevels, enabling in all
default ones
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read .init.scripts.runlevel "aaa" $["aaa":$["start":[], "stop":[]]]
-Read .init.scripts.comment "aaa" $["aaa":$["defstart":["3", "5"],
"defstop":["0", "1", "2", "6"], "description":"description",
"provides":["aaa"], "reqstart":["$local_fs", "$remote_fs", "$network"],
"reqstop":["$local_fs", "$remote_fs", "$network"],
"shortdescription":"description", "shouldstart":["$time"],
"shouldstop":["$time"]]]
-Execute .target.bash_output "/bin/systemctl enable aaa.service"
$["exit":0, "stderr":"", "stdout":""]
+Execute .target.bash "/bin/systemctl is-enabled aaa.service" 0
Return true
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Execute .target.bash_output "/bin/systemctl --force disable
aaa.service" $["exit":0, "stderr":"", "stdout":""]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceFullInfo.out
new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceFullInfo.out
--- old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceFullInfo.out
2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceFullInfo.out
2013-03-15 18:01:45.000000000 +0100
@@ -1,5 +1,6 @@
Read .target.tmpdir "/tmp"
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
+Log ### Calling Service::Info is broken with systemd! ###
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"],
"stop":["4", "5", "6"]]]
Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceInfo.out
new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceInfo.out
--- old/yast2-2.23.22/library/runlevel/testsuite/tests/ServiceInfo.out
2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.23.23/library/runlevel/testsuite/tests/ServiceInfo.out
2013-03-15 18:01:45.000000000 +0100
@@ -1,4 +1,5 @@
Read .target.tmpdir "/tmp"
+Log ### Calling Service::Info is broken with systemd! ###
Read .target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"],
"stop":["4", "5", "6"]]]
Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"],
"defstop":["4", "5", "6"]]]
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
