Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Thu Sep 15 14:18:55 CEST 2011.
-------- --- yast2-packager/yast2-packager.changes 2011-09-02 16:08:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-09-14 14:32:28.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Sep 14 12:25:12 UTC 2011 - [email protected] + +- fixed UI syntax error caused by wrong boolean expression + (bnc#711393) +- 2.21.15 + +------------------------------------------------------------------- +Wed Sep 14 10:44:49 UTC 2011 - [email protected] + +- set ignoreAlradyRecommended solver flag to false in fresh + installation/upgrade to include file system tools + (like btrfsprogs) (bnc#668588) +- 2.21.14 + +------------------------------------------------------------------- +Thu Sep 8 09:12:40 UTC 2011 - [email protected] + +- read biosdevname option directly from /proc/cmdline (bnc#712049) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.21.13.tar.bz2 New: ---- yast2-packager-2.21.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.TTjtfz/_old 2011-09-15 14:18:50.000000000 +0200 +++ /var/tmp/diff_new_pack.TTjtfz/_new 2011-09-15 14:18:50.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.21.13 +Version: 2.21.15 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.21.13.tar.bz2 +Source0: yast2-packager-2.21.15.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.21.13 +%setup -n yast2-packager-2.21.15 %build %{prefix}/bin/y2tool y2autoconf @@ -150,4 +150,5 @@ /usr/share/YaST2/modules/WebpinPackageSearch.ycp /usr/share/YaST2/modules/WebpinPackageSearch.ybc %{prefix}/share/applications/YaST2/webpin.desktop + %changelog ++++++ yast2-packager-2.21.13.tar.bz2 -> yast2-packager-2.21.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/VERSION new/yast2-packager-2.21.15/VERSION --- old/yast2-packager-2.21.13/VERSION 2011-09-02 16:03:27.000000000 +0200 +++ new/yast2-packager-2.21.15/VERSION 2011-09-14 14:30:32.000000000 +0200 @@ -1 +1 @@ -2.21.13 +2.21.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/configure new/yast2-packager-2.21.15/configure --- old/yast2-packager-2.21.13/configure 2011-09-02 16:04:54.000000000 +0200 +++ new/yast2-packager-2.21.15/configure 2011-09-14 14:31:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.13. +# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.21.13' -PACKAGE_STRING='yast2-packager 2.21.13' +PACKAGE_VERSION='2.21.15' +PACKAGE_STRING='yast2-packager 2.21.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-packager 2.21.13 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.21.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.21.13:";; + short | recursive ) echo "Configuration of yast2-packager 2.21.15:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.21.13 +yast2-packager configure 2.21.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-packager $as_me 2.21.13, which was +It was created by yast2-packager $as_me 2.21.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.21.13' + VERSION='2.21.15' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.13" +VERSION="2.21.15" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.21.13, which was +This file was extended by yast2-packager $as_me 2.21.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,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-packager config.status 2.21.13 +yast2-packager config.status 2.21.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/configure.in new/yast2-packager-2.21.15/configure.in --- old/yast2-packager-2.21.13/configure.in 2011-09-02 16:04:51.000000000 +0200 +++ new/yast2-packager-2.21.15/configure.in 2011-09-14 14:31:56.000000000 +0200 @@ -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-packager, 2.21.13, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.21.15, http://bugs.opensuse.org/, yast2-packager) 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.13" +VERSION="2.21.15" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/src/clients/install_test.ycp new/yast2-packager-2.21.15/src/clients/install_test.ycp --- old/yast2-packager-2.21.13/src/clients/install_test.ycp 2010-01-12 11:48:56.000000000 +0100 +++ new/yast2-packager-2.21.15/src/clients/install_test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - import "Package"; - - - Package::InstallAll(["yast2-nfs-server"]); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/src/modules/Packages.ycp new/yast2-packager-2.21.15/src/modules/Packages.ycp --- old/yast2-packager-2.21.13/src/modules/Packages.ycp 2011-09-02 16:04:41.000000000 +0200 +++ new/yast2-packager-2.21.15/src/modules/Packages.ycp 2011-09-14 12:53:49.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <[email protected]> * - * $Id: Packages.ycp 65516 2011-09-02 14:05:11Z lslezak $ + * $Id: Packages.ycp 65713 2011-09-14 10:53:47Z lslezak $ */ { @@ -834,31 +834,24 @@ { list<string> ret = []; - string biosdevname = (string)SCR::Read(.etc.install_inf.biosdevname); - y2milestone("read biosdevname option: %1", biosdevname); boolean add_biosdevname = false; + string cmdline = (string)SCR::Read(.target.string, "/proc/cmdline"); - if (biosdevname == "1") - { - y2milestone("Found biosdevname=1 kernel option, selecting biosdevname package to install"); - add_biosdevname = true; - } - else - { - string cmdline = (string)SCR::Read(.target.string, "/proc/cmdline"); + list<string> options = splitstring(cmdline, " \t"); - if (!issubstring(cmdline, "biosdevname")) - { - y2milestone("Missing biosdevname option, autodetecting..."); - if (DellSystem()) - { - add_biosdevname = true; - } - } - else - { - y2milestone("biosdevname disabled via kernel option, NOT selecting biosdevname package to install"); - } + if (contains(options, "biosdevname=1")) { + y2milestone("Biosdevname explicitly enabled"); + add_biosdevname = true; + } + else if (contains(options, "biosdevname=0")) { + y2milestone("Biosdevname explicitly disabled"); + add_biosdevname = false; + } + else { + y2milestone("Missing biosdevname option, autodetecting..."); + if (DellSystem()) { + add_biosdevname = true; + } } if (add_biosdevname) @@ -1871,6 +1864,9 @@ // Handle the default desktop DefaultDesktop::Init(); + // set ignoreAlreadyRecommended solver flag + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : Mode::normal()]); + // If anything has changed any new_packages_proposal = PackagesProposal::GetAllResolvablesForAllTypes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.21.15/src/modules/SlideShowCallbacks.ycp --- old/yast2-packager-2.21.13/src/modules/SlideShowCallbacks.ycp 2011-06-16 10:18:19.000000000 +0200 +++ new/yast2-packager-2.21.15/src/modules/SlideShowCallbacks.ycp 2011-09-14 14:31:47.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: provides the Callbacks for SlideShow * - * $Id: SlideShowCallbacks.ycp 64322 2011-06-13 13:35:17Z lslezak $ + * $Id: SlideShowCallbacks.ycp 65715 2011-09-14 12:31:46Z lslezak $ * */ @@ -525,7 +525,7 @@ // moved from PackageCallbacks // skip it when there is a popup at the top (see bnc#622286) - if ((ret == "" || URL::Check(ret) && UI::WidgetExists(`contents))) + if ((ret == "" || URL::Check(ret)) && UI::WidgetExists(`contents)) { PackageSlideShow::SetCurrentCdNo (PackageCallbacks::_current_source, wanted); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/testsuite/tests/Packages.out new/yast2-packager-2.21.15/testsuite/tests/Packages.out --- old/yast2-packager-2.21.13/testsuite/tests/Packages.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.15/testsuite/tests/Packages.out 2011-09-09 11:15:29.000000000 +0200 @@ -0,0 +1,24 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/y2update/control.xml" $["isreg":true] +Read .target.size "/y2update/control.xml" 1 +Read .xml "/y2update/control.xml" $[] +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .target.size "/etc/sysconfig/language" 1 +Read .sysconfig.language.ROOT_USES_LANG "ctype" +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .sysconfig.language.INSTALLED_LANGUAGES "" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Dump ----- biosdevname tests ----- +Read .target.string "/proc/cmdline" "install=cd:// vga=0x314 biosdevname=1" +Return ["biosdevname"] +Read .target.string "/proc/cmdline" "install=cd:// vga=0x314 biosdevname=0" +Return [] +Read .target.string "/proc/cmdline" "install=cd:// vga=0x314" +Execute .target.bash_output "/usr/sbin/hwinfo --bios" $["exit":0, "stderr":"", "stdout":" BIOS Info: #0\n Vendor: \"Dell Inc.\"\n Version: \"A03\""] +Return ["biosdevname"] +Read .target.string "/proc/cmdline" "install=cd:// vga=0x314" +Execute .target.bash_output "/usr/sbin/hwinfo --bios" $["exit":0, "stderr":"", "stdout":" BIOS Info: #0\n Vendor: \"FooBar Inc.\"\n Version: \"001\""] +Return [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.13/testsuite/tests/Packages.ycp new/yast2-packager-2.21.15/testsuite/tests/Packages.ycp --- old/yast2-packager-2.21.13/testsuite/tests/Packages.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.15/testsuite/tests/Packages.ycp 2011-09-09 11:15:29.000000000 +0200 @@ -0,0 +1,66 @@ +/** + * Testsuite for Packages.ycp module + * + */ + +{ + +include "testsuite.ycp"; + +// huh, we need to mock too much paths because of some module constructor... :-( +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "size" : 1, + "stat" : $["isreg": true], + "string" : "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" + ], + "xml" : $[], + "sysconfig" : $[ + "language" : $[ + "RC_LANG" : "en_US.UTF-8", + "ROOT_USES_LANG" : "ctype", + "RC_LANG" : "en_US.UTF-8", + "INSTALLED_LANGUAGES" : "" + ], + "console" : $[ + "CONSOLE_ENCODING" : "UTF-8" + ] + ] +]; + +map EXEC = $[ + "target" : $[ + "bash_output" : $[ "exit" : 0, "stdout" : "charmap=\"UTF-8\"\n"] + ] +]; + +TESTSUITE_INIT ([READ, $[], EXEC], nil); + +import "Packages"; + + + +DUMP(" ----- biosdevname tests ----- "); + +// explicitly enable +READ["target", "string"] = "install=cd:// vga=0x314 biosdevname=1"; +TEST(``(Packages::kernelCmdLinePackages()), [READ, $[], EXEC], nil); + +// explicitly disable +READ["target", "string"] = "install=cd:// vga=0x314 biosdevname=0"; +TEST(``(Packages::kernelCmdLinePackages()), [READ, $[], EXEC], nil); + + +// autodetection, no biosdevname=0|1 boot option +READ["target", "string"] = "install=cd:// vga=0x314"; + +// a Dell system +EXEC["target", "bash_output"] = $[ "exit" : 0, "stdout" : " BIOS Info: #0\n Vendor: \"Dell Inc.\"\n Version: \"A03\"", "stderr" : ""]; +TEST(``(Packages::kernelCmdLinePackages()), [READ, $[], EXEC], nil); + +// a non-Dell system +EXEC["target", "bash_output"] = $[ "exit" : 0, "stdout" : " BIOS Info: #0\n Vendor: \"FooBar Inc.\"\n Version: \"001\"", "stderr" : ""]; +TEST(``(Packages::kernelCmdLinePackages()), [READ, $[], EXEC], nil); + +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
