Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-06-29 14:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-06-05 13:25:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-06-29 14:57:51.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 27 16:10:13 CEST 2013 - jsuchome@suse.cz + +- show gpg key info in a term that allows copying the text + (bnc#611456) + -2.24.2 + +------------------------------------------------------------------- +Thu Jun 13 06:24:11 UTC 2013 - lslezak@suse.cz + +- updated the testsuite to make the transition to Ruby easier + +------------------------------------------------------------------- Old: ---- yast2-2.24.1.tar.bz2 New: ---- yast2-2.24.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.pBqJ7s/_old 2013-06-29 14:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pBqJ7s/_new 2013-06-29 14:57:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.24.1 +Version: 2.24.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.24.1.tar.bz2 -> yast2-2.24.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/VERSION new/yast2-2.24.2/VERSION --- old/yast2-2.24.1/VERSION 2013-05-27 14:36:37.000000000 +0200 +++ new/yast2-2.24.2/VERSION 2013-06-27 17:03:12.000000000 +0200 @@ -1 +1 @@ -2.24.1 +2.24.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/configure new/yast2-2.24.2/configure --- old/yast2-2.24.1/configure 2013-05-28 14:02:30.000000000 +0200 +++ new/yast2-2.24.2/configure 2013-06-27 17:03:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2 2.24.1. +# Generated by GNU Autoconf 2.69 for yast2 2.24.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='yast2 2.24.1' +PACKAGE_VERSION='2.24.2' +PACKAGE_STRING='yast2 2.24.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,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.24.1 to adapt to many kinds of systems. +\`configure' configures yast2 2.24.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.24.1:";; + short | recursive ) echo "Configuration of yast2 2.24.2:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.24.1 +yast2 configure 2.24.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,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.24.1, which was +It was created by yast2 $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.24.1' + VERSION='2.24.2' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.24.1" +VERSION="2.24.2" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <yast2-maintainers@suse.de>" @@ -3522,7 +3522,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.24.1, which was +This file was extended by yast2 $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,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 config.status 2.24.1 +yast2 config.status 2.24.2 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-2.24.1/configure.in new/yast2-2.24.2/configure.in --- old/yast2-2.24.1/configure.in 2013-05-28 14:02:17.000000000 +0200 +++ new/yast2-2.24.2/configure.in 2013-06-27 17:03:19.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.24.1, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.24.2, 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.24.1" +VERSION="2.24.2" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <yast2-maintainers@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/modules/Version.ycp new/yast2-2.24.2/library/modules/Version.ycp --- old/yast2-2.24.1/library/modules/Version.ycp 2013-05-28 14:02:38.000000000 +0200 +++ new/yast2-2.24.2/library/modules/Version.ycp 2013-06-27 17:03:30.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.24.1"; +global string yast2 = "2.24.2"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp 2013-06-27 17:03:12.000000000 +0200 @@ -508,31 +508,28 @@ term GPGKeyAsTerm(map<string,any> key) { - boolean no_fingerprint = key["fingerprint"]:"" == nil || key["fingerprint"]:"" == ""; - boolean no_exp_date = key["expires"]:"" == nil || key["expires"]:"" == ""; - boolean no_create_date = key["created"]:"" == nil || key["expires"]:"" == ""; - - return `HBox( - `VBox( - // GPG key property - `Left(`Label(_("ID: "))), - // GPG key property - `Left(`Label(_("Name: "))), - // GPG key property - no_fingerprint ? `Empty() : `Left(`Label(_("Fingerprint: "))), - // GPG key property - no_create_date ? `Empty() : `Left(`Label(_("Created: "))), - // GPG key property - no_exp_date ? `Empty() : `Left(`Label(_("Expires: "))) - ), - `VBox( - `Left(`Label(key["id"]:"")), - `Left(`Label(key["name"]:"")), - no_fingerprint ? `Empty() : `Left(`Label(StringSplitter(key["fingerprint"]:"", " ", 4))), - no_create_date ? `Empty() : `Left(`Label(key["created"]:"")), - no_exp_date ? `Empty() : `Left(`Label(key["expires"]:"")) - ) - ); + string rt = + // GPG key property + sformat ("<b>%1</b>%2", _("ID: "), key["id"]:"") + + // GPG key property + sformat ("<br><b>%1</b>%2", _("Name: "), key["name"]:""); + if (size (key["fingerprint"]:"") > 0) + { + // GPG key property + rt = rt + sformat ("<br><b>%1</b>%2", _("Fingerprint: "), + StringSplitter(key["fingerprint"]:"", " ", 4)); + } + if (size (key["created"]:"") > 0) + { + // GPG key property + rt = rt + sformat ("<br><b>%1</b>%2", _("Created: "), key["created"]:""); + } + if (size (key["expires"]:"") > 0) + { + // GPG key property + rt = rt + sformat ("<br><b>%1</b>%2", _("Expires: "), key["expires"]:""); + } + return `RichText (rt); } /** @@ -801,10 +798,7 @@ // the important GPG key properties are completely displayed boolean hide_help = displayinfo["TextMode"]:false && displayinfo["Width"]:80 < 105; - UI::OpenDialog( - `opt(`decorated), - `HBox ( - `VSpacing(19), + UI::OpenDialog (`opt(`decorated), `HBox ( // left-side help hide_help ? `Empty() : `HWeight(3, @@ -814,39 +808,27 @@ ), `HSpacing(1.5), // dialog - `HWeight(5, - `VBox( - `Top ( - `VBox ( - `HBox ( - `VCenter(MessageIcon("question")), - // popup heading - `VCenter(`Heading(_("Import Untrusted GnuPG Key"))), - `HStretch() - ), - // dialog message - `MarginBox(0.5, 0.5, `VBox( - `Left(`Label(dialog_text)), - `VSpacing(0.5), - GPGKeyAsTerm(key), - `VSpacing(0.5), - `Left(`Label(dialog_text2)) - ) - ) - ) + `HWeight(5, `VBox( + `HBox ( + `VCenter(MessageIcon("question")), + // popup heading + `VCenter(`Heading(_("Import Untrusted GnuPG Key"))), + `HStretch() ), - // dialog buttons - `Bottom( + // dialog message + `MarginBox(0.4, 0.4, `VBox( + `Left(`Label(dialog_text)), + GPGKeyAsTerm(key), + `Left(`Label(dialog_text2)) + )), + // dialog buttons `ButtonBox ( // push button `PushButton(`id(`trust), `opt (`key_F10, `okButton), _("&Trust")), `PushButton(`id(`cancel), `opt (`key_F9, `cancelButton), Label::CancelButton()) ) - ) - ) - ) - ) - ); + )) + )); UI::SetFocus(`cancel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp --- old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp 2013-06-13 08:30:58.000000000 +0200 @@ -88,7 +88,7 @@ } else if (is(val, list)) { if(size((list) val) < 2) { - y2error(2, "sequencer check: list too small: %1 (%2)", val, key); + y2error(2, "sequencer check: list size too small: %1 (key: %2)", size((list) val), key); return false; } /* FIXME: use function pointers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out 2013-06-13 08:30:58.000000000 +0200 @@ -4,10 +4,10 @@ Return nil Log sequencer: Alias not found: 1 Return nil -Return func1 () +Return `func1 Log sequencer: Invalid alias: [] Return nil Log sequencer: Invalid alias: nil Return nil -Return func2 () -Return func3 () +Return `func2 +Return `func3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp 2013-06-13 08:30:58.000000000 +0200 @@ -24,9 +24,9 @@ include "testsuite.ycp"; import "Sequencer"; -void func1() { return; } -void func2() { return; } -void func3() { return; } +symbol func1() { return `func1; } +symbol func2() { return `func2; } +symbol func3() { return `func3; } map aliases = $[ "1" : nil, @@ -40,10 +40,10 @@ TEST(``(Sequencer::WS_alias($[], "blah")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "blah")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "1")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "2")), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "2"))), [], nil); TEST(``(Sequencer::WS_alias(aliases, "3")), [], nil); TEST(``(Sequencer::WS_alias(aliases, "4")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "5")), [], nil); -TEST(``(Sequencer::WS_alias(aliases, "6")), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "5"))), [], nil); +TEST(``(eval(Sequencer::WS_alias(aliases, "6"))), [], nil); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out --- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out 2013-06-13 08:30:58.000000000 +0200 @@ -1,7 +1,7 @@ Log sequencer check: ws_start needs to be defined Return false -Log sequencer check: list too small: [] (2) -Log sequencer check: list too small: [f1 ()] (3) +Log sequencer check: list size too small: 0 (key: 2) +Log sequencer check: list size too small: 1 (key: 3) Log sequencer check: not a boolean: `x Log sequencer check: not a boolean: 5 Log sequencer check: not a string: `x -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org