Hello community, here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at 2011-12-15 16:09:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-wagon (Old) and /work/SRC/openSUSE:Factory/.yast2-wagon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-wagon", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-wagon/yast2-wagon.changes 2011-11-16 17:23:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-wagon.new/yast2-wagon.changes 2011-12-15 16:09:58.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 25 16:15:24 UTC 2011 - [email protected] + +- fixed registration status check when there is only one product + installed (bnc#732813) +- 2.22.1 + +------------------------------------------------------------------- Old: ---- yast2-wagon-2.22.0.tar.bz2 New: ---- yast2-wagon-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.8gpIx5/_old 2011-12-15 16:09:59.000000000 +0100 +++ /var/tmp/diff_new_pack.8gpIx5/_new 2011-12-15 16:09:59.000000000 +0100 @@ -19,7 +19,7 @@ Name: yast2-wagon -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-wagon-2.22.0.tar.bz2 -> yast2-wagon-2.22.1.tar.bz2 ++++++ ++++ 1738 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/VERSION new/yast2-wagon-2.22.1/VERSION --- old/yast2-wagon-2.22.0/VERSION 2011-11-16 11:40:08.000000000 +0100 +++ new/yast2-wagon-2.22.1/VERSION 2011-11-25 19:25:31.000000000 +0100 @@ -1 +1 @@ -2.22.0 +2.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/configure.in new/yast2-wagon-2.22.1/configure.in --- old/yast2-wagon-2.22.0/configure.in 2011-11-16 11:24:38.000000000 +0100 +++ new/yast2-wagon-2.22.1/configure.in 2011-11-25 19:56:43.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-wagon, 2.21.6, http://bugs.opensuse.org/, yast2-wagon) +AC_INIT(yast2-wagon, 2.22.1, http://bugs.opensuse.org/, yast2-wagon) 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.6" +VERSION="2.22.1" RPMNAME="yast2-wagon" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/src/clients/wagon.ycp new/yast2-wagon-2.22.1/src/clients/wagon.ycp --- old/yast2-wagon-2.22.0/src/clients/wagon.ycp 2011-11-16 11:39:43.000000000 +0100 +++ new/yast2-wagon-2.22.1/src/clients/wagon.ycp 2011-11-25 17:31:16.000000000 +0100 @@ -12,7 +12,7 @@ * Summary: * Online Migration Tool * - * $Id: wagon.ycp 64676 2011-06-30 14:22:45Z lslezak $ + * $Id: wagon.ycp 66818 2011-11-16 10:49:26Z jsuchome $ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/src/clients/wagon_congratulate.ycp new/yast2-wagon-2.22.1/src/clients/wagon_congratulate.ycp --- old/yast2-wagon-2.22.0/src/clients/wagon_congratulate.ycp 2011-11-16 11:39:43.000000000 +0100 +++ new/yast2-wagon-2.22.1/src/clients/wagon_congratulate.ycp 2011-11-25 17:31:16.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id: wagon_congratulate.ycp 60676 2010-02-03 16:14:12Z locilka $ + * $Id: wagon_congratulate.ycp 66818 2011-11-16 10:49:26Z jsuchome $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/src/clients/wagon_update_url.ycp new/yast2-wagon-2.22.1/src/clients/wagon_update_url.ycp --- old/yast2-wagon-2.22.0/src/clients/wagon_update_url.ycp 2011-11-16 11:39:43.000000000 +0100 +++ new/yast2-wagon-2.22.1/src/clients/wagon_update_url.ycp 2011-11-25 17:31:16.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id: wagon_update_url.ycp 61324 2010-03-15 16:17:02Z locilka $ + * $Id: wagon_update_url.ycp 66818 2011-11-16 10:49:26Z jsuchome $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/src/modules/Wagon.ycp new/yast2-wagon-2.22.1/src/modules/Wagon.ycp --- old/yast2-wagon-2.22.0/src/modules/Wagon.ycp 2011-11-16 11:39:43.000000000 +0100 +++ new/yast2-wagon-2.22.1/src/modules/Wagon.ycp 2011-11-25 19:36:28.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <[email protected]> * Internal * - * $Id: Wagon.ycp 65108 2011-08-01 12:06:02Z lslezak $ + * $Id: Wagon.ycp 66963 2011-11-25 18:37:32Z lslezak $ * * Module for handling WAGON. * @@ -864,7 +864,9 @@ map status = RegistrationStatus::ReadFile(file); timestamp = tointeger(status["generated"]:"-1"); - list<map> products = status["productstatus"]:[]; + + any read_products = status["productstatus"]:nil; + list<map> products = is(read_products, map) ? [ (map)read_products ] : (list<map>)read_products; // check each product foreach(map product, products, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/Makefile.am new/yast2-wagon-2.22.1/testsuite/Makefile.am --- old/yast2-wagon-2.22.0/testsuite/Makefile.am 2009-12-18 14:49:45.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/Makefile.am 2011-11-25 19:24:36.000000000 +0100 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.xml) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/Wagon_test.out new/yast2-wagon-2.22.1/testsuite/tests/Wagon_test.out --- old/yast2-wagon-2.22.0/testsuite/tests/Wagon_test.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/Wagon_test.out 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,21 @@ +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" +Read .target.size "tests/registration-1product.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-2products.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES", "sle-slms"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-expired.xml" 1 +Return $["expired":["sle-slms"], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-error.xml" 1 +Return $["expired":[], "failed":["SUSE_SLES", "sle-slms"], "no_subscription":[], "provisional":[], "registered":[], "registered_system":true, "rma":[], "timestamp":1279715826] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/Wagon_test.ycp new/yast2-wagon-2.22.1/testsuite/tests/Wagon_test.ycp --- old/yast2-wagon-2.22.0/testsuite/tests/Wagon_test.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/Wagon_test.ycp 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,57 @@ +/** + * Testsuite for Wagon.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 "Wagon"; + +// check parsing registration status file + +// one registered product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-1product.xml")), [[READ], [], []], 0); + +// two registered products +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-2products.xml")), [[READ], [], []], 0); + +// one expired product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-expired.xml")), [[READ], [], []], 0); + +// failed registration +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-error.xml")), [[READ], [], []], 0); + + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/registration-1product.xml new/yast2-wagon-2.22.1/testsuite/tests/registration-1product.xml --- old/yast2-wagon-2.22.0/testsuite/tests/registration-1product.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/registration-1product.xml 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/registration-2products.xml new/yast2-wagon-2.22.1/testsuite/tests/registration-2products.xml --- old/yast2-wagon-2.22.0/testsuite/tests/registration-2products.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/registration-2products.xml 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/registration-error.xml new/yast2-wagon-2.22.1/testsuite/tests/registration-error.xml --- old/yast2-wagon-2.22.0/testsuite/tests/registration-error.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/registration-error.xml 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1279715826"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Linux Enterprise Server 11 SP1 was provided.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Lifecycle Management Server 1.0 was provided.</message> + </productstatus> +</status> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.22.0/testsuite/tests/registration-expired.xml new/yast2-wagon-2.22.1/testsuite/tests/registration-expired.xml --- old/yast2-wagon-2.22.0/testsuite/tests/registration-expired.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.22.1/testsuite/tests/registration-expired.xml 2011-11-25 19:24:36.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_SUB_EXP"> + <subscription status="EXPIRED" expiration="1280302484" type="EVALUATION"/> + <message>The subscription for SUSE Lifecycle Management Server 1.0 is expired.</message> + </productstatus> +</status> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
