Hello community,
here is the log from the commit of package yast2-sound
checked in at Tue Dec 2 15:47:11 CET 2008.
--------
--- yast2-sound/yast2-sound.changes 2008-11-25 17:43:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2008-12-02 13:06:33.442372000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 2 12:48:10 CET 2008 - lslezak@suse.cz
+
+- fixed package installation in autoyast installation mode
+ (bnc#450416)
+- 2.17.13
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-sound-2.17.12.tar.bz2
New:
----
yast2-sound-2.17.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sound.spec ++++++
--- /var/tmp/diff_new_pack.MA8105/_old 2008-12-02 15:45:12.000000000 +0100
+++ /var/tmp/diff_new_pack.MA8105/_new 2008-12-02 15:45:12.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-sound (Version 2.17.12)
+# spec file for package yast2-sound (Version 2.17.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-sound
-Version: 2.17.12
+Version: 2.17.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-sound-2.17.12.tar.bz2
+Source0: yast2-sound-2.17.13.tar.bz2
Prefix: /usr
BuildRequires: alsa-devel doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
# GetInstArgs::automatic_configuration
@@ -48,7 +48,7 @@
Dan Meszaros
%prep
-%setup -n yast2-sound-2.17.12
+%setup -n yast2-sound-2.17.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,10 @@
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-sound
%changelog
+* Tue Dec 02 2008 lslezak@suse.cz
+- fixed package installation in autoyast installation mode
+ (bnc#450416)
+- 2.17.13
* Tue Nov 25 2008 lslezak@suse.cz
- fixed "Really Abort" popup behavior in the "Add" dialog
(bnc#447408)
++++++ yast2-sound-2.17.12.tar.bz2 -> yast2-sound-2.17.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.12/configure new/yast2-sound-2.17.13/configure
--- old/yast2-sound-2.17.12/configure 2008-11-25 17:32:20.000000000 +0100
+++ new/yast2-sound-2.17.13/configure 2008-12-02 12:49:51.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-sound 2.17.12.
+# Generated by GNU Autoconf 2.63 for yast2-sound 2.17.13.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-sound'
PACKAGE_TARNAME='yast2-sound'
-PACKAGE_VERSION='2.17.12'
-PACKAGE_STRING='yast2-sound 2.17.12'
+PACKAGE_VERSION='2.17.13'
+PACKAGE_STRING='yast2-sound 2.17.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1532,7 +1532,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-sound 2.17.12 to adapt to many kinds of systems.
+\`configure' configures yast2-sound 2.17.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1603,7 +1603,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-sound 2.17.12:";;
+ short | recursive ) echo "Configuration of yast2-sound 2.17.13:";;
esac
cat <<\_ACEOF
@@ -1716,7 +1716,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-sound configure 2.17.12
+yast2-sound configure 2.17.13
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1730,7 +1730,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-sound $as_me 2.17.12, which was
+It was created by yast2-sound $as_me 2.17.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2577,7 +2577,7 @@
# Define the identity of the package.
PACKAGE='yast2-sound'
- VERSION='2.17.12'
+ VERSION='2.17.13'
cat >>confdefs.h <<_ACEOF
@@ -2801,7 +2801,7 @@
-VERSION="2.17.12"
+VERSION="2.17.13"
RPMNAME="yast2-sound"
MAINTAINER="Ladislav Slezak "
@@ -17418,7 +17418,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-sound $as_me 2.17.12, which was
+This file was extended by yast2-sound $as_me 2.17.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17481,7 +17481,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-sound config.status 2.17.12
+yast2-sound config.status 2.17.13
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-sound-2.17.12/configure.in new/yast2-sound-2.17.13/configure.in
--- old/yast2-sound-2.17.12/configure.in 2008-11-25 17:32:06.000000000 +0100
+++ new/yast2-sound-2.17.13/configure.in 2008-12-02 12:49:36.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-sound, 2.17.12, http://bugs.opensuse.org/, yast2-sound)
+AC_INIT(yast2-sound, 2.17.13, http://bugs.opensuse.org/, yast2-sound)
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.17.12"
+VERSION="2.17.13"
RPMNAME="yast2-sound"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.12/sound/src/sound_auto.ycp new/yast2-sound-2.17.13/sound/src/sound_auto.ycp
--- old/yast2-sound-2.17.12/sound/src/sound_auto.ycp 2008-10-07 18:22:20.000000000 +0200
+++ new/yast2-sound-2.17.13/sound/src/sound_auto.ycp 2008-12-02 12:49:27.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Dan Meszaros
*
- * $Id: sound_auto.ycp 51938 2008-10-07 16:22:18Z lslezak $
+ * $Id: sound_auto.ycp 53801 2008-12-02 11:49:26Z lslezak $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -109,6 +109,9 @@
/* Create a summary*/
if(func == "Import") {
+ // detect the cards on the system, so we could write them
+ // correctly:
+ param = UpdateCardsToTargetSystem (param);
ret = Sound::Import(param) && PulseAudio::Import(param);
}
/* Create a summary*/
@@ -139,7 +142,19 @@
}
/* Return required package list */
else if (func == "Packages") {
- ret = $[];
+ list<string> packages_to_install = [];
+
+ list<string> reqmodules = Sound::RequiredKernelModules();
+ foreach(string driver, reqmodules,
+ {
+ list<string> req_packages = Sound::RequiredPackagesToInstall(driver);
+ packages_to_install = (list<string>)union(packages_to_install, req_packages);
+ }
+ );
+
+ y2milestone("Collected packages to install: %1", packages_to_install);
+
+ ret = $[ "install" : packages_to_install ];
}
/* Return actual state */
else if (func == "Export") {
@@ -154,16 +169,12 @@
PulseAudio::Read();
ret = Sound::Read (false);
}
- /* Write givven settings */
+ /* Write given settings */
else if (func == "Write") {
import "Progress";
boolean progress_orig = Progress::set(false);
map settings = Sound::Export();
Sound::write_only = true;
- // detect the cards on the system, so we could write them
- // correctly:
- settings = UpdateCardsToTargetSystem (settings);
- Sound::Import (settings);
ret = WFM::CallFunction ("sound_write", [ settings ]);
Progress::set(progress_orig);
return ret;
@@ -174,7 +185,7 @@
ret = false;
}
- y2debug("ret=%1", ret);
+ y2milestone("ret=%1", ret);
y2milestone("Sound auto finished");
y2milestone("----------------------------------------");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.12/sound/src/sound_write.ycp new/yast2-sound-2.17.13/sound/src/sound_write.ycp
--- old/yast2-sound-2.17.12/sound/src/sound_write.ycp 2008-10-08 13:16:33.000000000 +0200
+++ new/yast2-sound-2.17.13/sound/src/sound_write.ycp 2008-12-02 12:49:27.000000000 +0100
@@ -12,7 +12,7 @@
* Dan Vesely
* Dan Meszaros
*
- * $Id: sound_write.ycp 51978 2008-10-08 11:16:31Z lslezak $
+ * $Id: sound_write.ycp 53801 2008-12-02 11:49:26Z lslezak $
*
* Parameters are given in a map with keys:
* "modules_conf" ... save info- list of configured cards:
@@ -183,7 +183,7 @@
_("Storing joystick settings..."),
];
- if (install)
+ if (install && !Mode::autoinst())
{
// progress bar item
stones = add(stones, _("Install required packages"));
@@ -206,27 +206,34 @@
Progress::NextStage();
- // get required sound and joystick kernel modules
- list<string> reqmodules = Sound::RequiredKernelModules();
- list<string> reqjoymodules = Joystick::RequiredKernelModules();
+ list<string> reqmodules = [];
- if (reqmodules == nil)
+ // in autoyast installation the packages are installed by autoyast
+ // see sound_auto.ycp - it's called with "Packages" argument
+ if (!Mode::autoinst())
{
- reqmodules = [];
- }
+ // get required sound and joystick kernel modules
+ reqmodules = Sound::RequiredKernelModules();
+ list<string> reqjoymodules = Joystick::RequiredKernelModules();
- if (reqjoymodules == nil)
- {
- reqjoymodules = [];
- }
+ if (reqmodules == nil)
+ {
+ reqmodules = [];
+ }
- // merge lists, remove duplicates
- reqmodules = (list<string>) union(reqmodules, reqjoymodules);
+ if (reqjoymodules == nil)
+ {
+ reqjoymodules = [];
+ }
- if (size(reqmodules) > 0)
- {
- // ensure that all required kernel modules are installed
- Package::InstallKernel(reqmodules);
+ // merge lists, remove duplicates
+ reqmodules = (list<string>) union(reqmodules, reqjoymodules);
+
+ if (size(reqmodules) > 0)
+ {
+ // ensure that all required kernel modules are installed
+ Package::InstallKernel(reqmodules);
+ }
}
// save config to /etc/modprobe.d/sound
@@ -301,7 +308,7 @@
// write joystick configuration
Joystick::Write (abort_block);
- if (install)
+ if (install && !Mode::autoinst())
{
Progress::NextStage();
install_packages(reqmodules);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.12/VERSION new/yast2-sound-2.17.13/VERSION
--- old/yast2-sound-2.17.12/VERSION 2008-11-25 17:31:25.000000000 +0100
+++ new/yast2-sound-2.17.13/VERSION 2008-12-02 12:49:02.000000000 +0100
@@ -1 +1 @@
-2.17.12
+2.17.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org