Hello community, here is the log from the commit of package yast2-packager for openSUSE:13.1 checked in at 2013-11-06 15:21:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/yast2-packager (Old) and /work/SRC/openSUSE:13.1/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:13.1/yast2-packager/yast2-packager.changes 2013-10-19 16:51:03.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.yast2-packager.new/yast2-packager.changes 2013-11-06 15:21:38.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 6 13:41:42 UTC 2013 - [email protected] + +- reinitialize the target to sync the libzypp repomanager + so the online repositories are correctly written during update + (bnc#847659) +- 3.0.8 + +------------------------------------------------------------------- +Mon Nov 4 11:37:42 UTC 2013 - [email protected] + +- fixed vendor detection, check the output directly in shell + to avoid reading binary (non-UTF8) text (bnc#847153) +- 3.0.7 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.0.6.tar.bz2 New: ---- yast2-packager-3.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.t9lYvu/_old 2013-11-06 15:21:38.000000000 +0100 +++ /var/tmp/diff_new_pack.t9lYvu/_new 2013-11-06 15:21:38.000000000 +0100 @@ -17,8 +17,8 @@ Name: yast2-packager -Version: 3.0.6 -Release: 5 +Version: 3.0.8 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-packager-%{version}.tar.bz2 ++++++ yast2-packager-3.0.6.tar.bz2 -> yast2-packager-3.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/VERSION new/yast2-packager-3.0.8/VERSION --- old/yast2-packager-3.0.6/VERSION 2013-10-15 09:11:21.000000000 +0200 +++ new/yast2-packager-3.0.8/VERSION 2013-11-06 14:41:21.000000000 +0100 @@ -1 +1 @@ -3.0.6 +3.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/configure new/yast2-packager-3.0.8/configure --- old/yast2-packager-3.0.6/configure 2013-10-15 09:19:01.000000000 +0200 +++ new/yast2-packager-3.0.8/configure 2013-11-06 14:45:18.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-packager 3.0.6. +# Generated by GNU Autoconf 2.69 for yast2-packager 3.0.8. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='3.0.6' -PACKAGE_STRING='yast2-packager 3.0.6' +PACKAGE_VERSION='3.0.8' +PACKAGE_STRING='yast2-packager 3.0.8' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1249,7 +1249,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 3.0.6 to adapt to many kinds of systems. +\`configure' configures yast2-packager 3.0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1320,7 +1320,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 3.0.6:";; + short | recursive ) echo "Configuration of yast2-packager 3.0.8:";; esac cat <<\_ACEOF @@ -1400,7 +1400,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 3.0.6 +yast2-packager configure 3.0.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1417,7 +1417,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 3.0.6, which was +It was created by yast2-packager $as_me 3.0.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2356,7 +2356,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='3.0.6' + VERSION='3.0.8' cat >>confdefs.h <<_ACEOF @@ -2479,7 +2479,7 @@ -VERSION="3.0.6" +VERSION="3.0.8" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3432,7 +3432,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 3.0.6, which was +This file was extended by yast2-packager $as_me 3.0.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3485,7 +3485,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 3.0.6 +yast2-packager config.status 3.0.8 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-packager-3.0.6/configure.ac new/yast2-packager-3.0.8/configure.ac --- old/yast2-packager-3.0.6/configure.ac 2013-10-15 09:18:59.000000000 +0200 +++ new/yast2-packager-3.0.8/configure.ac 2013-11-06 14:45:16.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-packager, 3.0.6, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 3.0.8, 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="3.0.6" +VERSION="3.0.8" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/src/clients/pkg_finish.rb new/yast2-packager-3.0.8/src/clients/pkg_finish.rb --- old/yast2-packager-3.0.6/src/clients/pkg_finish.rb 2013-08-02 08:22:46.000000000 +0200 +++ new/yast2-packager-3.0.8/src/clients/pkg_finish.rb 2013-11-06 14:41:15.000000000 +0100 @@ -185,6 +185,10 @@ Builtins.y2milestone("All old repositories were removed from the target") + # reload the target to sync the removed repositories with libzypp repomanager + Pkg.TargetFinish + Pkg.TargetInitialize("/mnt") + nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/src/modules/Packages.rb new/yast2-packager-3.0.8/src/modules/Packages.rb --- old/yast2-packager-3.0.6/src/modules/Packages.rb 2013-10-15 09:03:14.000000000 +0200 +++ new/yast2-packager-3.0.8/src/modules/Packages.rb 2013-11-06 14:41:11.000000000 +0100 @@ -838,24 +838,10 @@ # CHeck whether this is a Dell system def DellSystem - ret = false - command = "/usr/sbin/hwinfo --bios" + command = "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell Inc\\.'" Builtins.y2milestone("Executing: %1", command) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) - Builtins.y2milestone("Result: %1", out) - - if Ops.get_integer(out, "exit", -1) == 0 - lines = Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n") - - Builtins.foreach(lines) do |line| - if Builtins.regexpmatch(line, "Vendor:.*Dell Inc.*") - Builtins.y2milestone("Found matching line: %1", line) - ret = true - end - end - end - + ret = SCR.Execute(path(".target.bash"), command) == 0 Builtins.y2milestone("Detected a Dell system") if ret ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/testsuite/tests/Packages.out new/yast2-packager-3.0.8/testsuite/tests/Packages.out --- old/yast2-packager-3.0.6/testsuite/tests/Packages.out 2013-08-27 09:01:36.000000000 +0200 +++ new/yast2-packager-3.0.8/testsuite/tests/Packages.out 2013-11-04 13:31:33.000000000 +0100 @@ -15,8 +15,8 @@ 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\""] +Execute .target.bash "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell Inc\\.'" 0 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\""] +Execute .target.bash "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell Inc\\.'" 1 Return [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.0.6/testsuite/tests/Packages.rb new/yast2-packager-3.0.8/testsuite/tests/Packages.rb --- old/yast2-packager-3.0.6/testsuite/tests/Packages.rb 2013-08-27 09:01:36.000000000 +0200 +++ new/yast2-packager-3.0.8/testsuite/tests/Packages.rb 2013-11-04 13:31:33.000000000 +0100 @@ -63,28 +63,16 @@ # a Dell system Ops.set( @EXEC, - ["target", "bash_output"], - { - "exit" => 0, - "stdout" => " BIOS Info: #0\n" + - " Vendor: \"Dell Inc.\"\n" + - " Version: \"A03\"", - "stderr" => "" - } + ["target", "bash"], + 0 ) TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) # a non-Dell system Ops.set( @EXEC, - ["target", "bash_output"], - { - "exit" => 0, - "stdout" => " BIOS Info: #0\n" + - " Vendor: \"FooBar Inc.\"\n" + - " Version: \"001\"", - "stderr" => "" - } + ["target", "bash"], + 1 ) TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
