Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon Jan 18 15:07:27 CET 2010. -------- --- yast2/yast2.changes 2010-01-15 13:49:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-01-18 14:45:38.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 18 14:36:37 CET 2010 - jsuchome@suse.cz + +- SERVICES.pm: read descriptions (bnc#570298); get single service + status from the Read function (bnc#570968) +- 2.19.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.19.4.tar.bz2 New: ---- yast2-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.7b6qiD/_old 2010-01-18 15:06:29.000000000 +0100 +++ /var/tmp/diff_new_pack.7b6qiD/_new 2010-01-18 15:06:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.19.4) +# spec file for package yast2 (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2 -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.19.4.tar.bz2 +Source0: yast2-2.19.5.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -113,7 +113,7 @@ installation with YaST2. %prep -%setup -n yast2-2.19.4 +%setup -n yast2-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.19.4.tar.bz2 -> yast2-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.4/configure new/yast2-2.19.5/configure --- old/yast2-2.19.4/configure 2010-01-15 13:50:19.000000000 +0100 +++ new/yast2-2.19.5/configure 2010-01-18 14:40:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.19.4. +# Generated by GNU Autoconf 2.63 for yast2 2.19.5. # # Report bugs to http://bugs.opensuse.org/. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='yast2 2.19.4' +PACKAGE_VERSION='2.19.5' +PACKAGE_STRING='yast2 2.19.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,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.19.4 to adapt to many kinds of systems. +`configure' configures yast2 2.19.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.19.4:";; + short | recursive ) echo "Configuration of yast2 2.19.5:";; esac cat <<_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2 configure 2.19.4 +yast2 configure 2.19.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,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.19.4, which was +It was created by yast2 $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.19.4' + VERSION='2.19.5' cat >>confdefs.h <<_ACEOF @@ -2544,7 +2544,7 @@ -VERSION="2.19.4" +VERSION="2.19.5" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -3606,7 +3606,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.19.4, which was +This file was extended by yast2 $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3656,7 +3656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\ -yast2 config.status 2.19.4 +yast2 config.status 2.19.5 configured by $0, generated by GNU Autoconf 2.63, with options \"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.4/configure.in new/yast2-2.19.5/configure.in --- old/yast2-2.19.4/configure.in 2010-01-15 13:50:16.000000000 +0100 +++ new/yast2-2.19.5/configure.in 2010-01-18 14:40:47.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.19.4, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.19.5, 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.19.4" +VERSION="2.19.5" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.4/library/modules/Version.ycp new/yast2-2.19.5/library/modules/Version.ycp --- old/yast2-2.19.4/library/modules/Version.ycp 2010-01-15 13:50:25.000000000 +0100 +++ new/yast2-2.19.5/library/modules/Version.ycp 2010-01-18 14:40:55.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.19.4"; +global string yast2 = "2.19.5"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.4/library/runlevel/src/YaPI/SERVICES.pm new/yast2-2.19.5/library/runlevel/src/YaPI/SERVICES.pm --- old/yast2-2.19.4/library/runlevel/src/YaPI/SERVICES.pm 2009-11-10 14:54:44.000000000 +0100 +++ new/yast2-2.19.5/library/runlevel/src/YaPI/SERVICES.pm 2010-01-18 14:04:30.000000000 +0100 @@ -116,9 +116,11 @@ # Return the map of services enabled in given runlevel # Parameter is an argument map with possible keys: # "runlevel" : integer -# "read_status" : if present, service status will be queried -# "custom" : if present, custom services (defined in config file) will be read -# returns array of hashes +# "read_status" : if true, service status will be queried +# "custom" : if true, custom services (defined in config file) will be read +# "description" : if true, read the description of each service +# "service" : if defined, the status of this given service will be returned +# @returns array of hashes BEGIN{$TYPEINFO{Read} = ["function", ["list", [ "map", "string", "any"]], ["map", "string", "any"]]; @@ -131,6 +133,21 @@ my $runlevel = 5; $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; + # only read status of one service if the name was given + if ($args->{"service"} || "") { + my $exec = $self->Execute ({ + "name" => $args->{"service"} || "", + "action" => "status", + "custom" => $args->{"custom"} || 0 + }); + my $s = { + "name" => $args->{"service"} || "", + "status" => $exec->{"exit"} || 0 + }; + push @ret, $s; + return @ret; + } + if ($args->{"custom"} || 0) { return read_custom_services ($args); } @@ -140,6 +157,11 @@ "name" => $name }; $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); + if (($args->{"description"} || 0) || ($args->{"shortdescription"} || 0)) { + my $info = Service->Info ($name); + $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; + $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; + } push @ret, $s; } return @ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.4/VERSION new/yast2-2.19.5/VERSION --- old/yast2-2.19.4/VERSION 2010-01-15 13:49:50.000000000 +0100 +++ new/yast2-2.19.5/VERSION 2010-01-18 14:38:55.000000000 +0100 @@ -1 +1 @@ -2.19.4 +2.19.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org