Hello community, here is the log from the commit of package yast2-fingerprint-reader for openSUSE:Factory checked in at 2012-04-12 09:57:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fingerprint-reader (Old) and /work/SRC/openSUSE:Factory/.yast2-fingerprint-reader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fingerprint-reader", Maintainer is "jsuchome@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2012-03-30 14:21:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fingerprint-reader.new/yast2-fingerprint-reader.changes 2012-04-12 09:57:43.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 10 16:15:27 CEST 2012 - jsuchome@suse.cz + +- added Retry button, do not show two Cancel buttons (bnc#680117) +- reduce agent logging +- 2.22.3 + +------------------------------------------------------------------- Old: ---- yast2-fingerprint-reader-2.22.2.tar.bz2 New: ---- yast2-fingerprint-reader-2.22.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fingerprint-reader.spec ++++++ --- /var/tmp/diff_new_pack.TB4Y8R/_old 2012-04-12 09:57:44.000000000 +0200 +++ /var/tmp/diff_new_pack.TB4Y8R/_new 2012-04-12 09:57:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fingerprint-reader -Version: 2.22.2 +Version: 2.22.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fingerprint-reader-2.22.2.tar.bz2 -> yast2-fingerprint-reader-2.22.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fingerprint-reader-2.22.2/VERSION new/yast2-fingerprint-reader-2.22.3/VERSION --- old/yast2-fingerprint-reader-2.22.2/VERSION 2012-03-29 14:40:19.000000000 +0200 +++ new/yast2-fingerprint-reader-2.22.3/VERSION 2012-04-10 16:16:10.000000000 +0200 @@ -1 +1 @@ -2.22.2 +2.22.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fingerprint-reader-2.22.2/agent-fprint/src/FPrintAgent.cc new/yast2-fingerprint-reader-2.22.3/agent-fprint/src/FPrintAgent.cc --- old/yast2-fingerprint-reader-2.22.2/agent-fprint/src/FPrintAgent.cc 2012-03-23 08:33:06.000000000 +0100 +++ new/yast2-fingerprint-reader-2.22.3/agent-fprint/src/FPrintAgent.cc 2012-04-10 15:49:46.000000000 +0200 @@ -145,7 +145,7 @@ r = fp_enroll_finger (dev, &enrolled_print); - y2internal ("retval: %d", r); + y2debug ("retval: %d", r); if (r < 0) { y2error ("Enroll failed with error %d", r); @@ -216,7 +216,7 @@ */ YCPValue FPrintAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) { - y2internal ("Path in Read(): %s", path->toString().c_str()); + y2debug ("Path in Read(): %s", path->toString().c_str()); YCPValue ret = YCPVoid(); if (path->length() == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fingerprint-reader-2.22.2/configure new/yast2-fingerprint-reader-2.22.3/configure --- old/yast2-fingerprint-reader-2.22.2/configure 2012-03-26 07:51:03.000000000 +0200 +++ new/yast2-fingerprint-reader-2.22.3/configure 2012-04-10 10:39:57.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-fingerprint-reader 2.22.1. +# Generated by GNU Autoconf 2.68 for yast2-fingerprint-reader 2.22.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-fingerprint-reader' PACKAGE_TARNAME='yast2-fingerprint-reader' -PACKAGE_VERSION='2.22.1' -PACKAGE_STRING='yast2-fingerprint-reader 2.22.1' +PACKAGE_VERSION='2.22.2' +PACKAGE_STRING='yast2-fingerprint-reader 2.22.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1354,7 +1354,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-fingerprint-reader 2.22.1 to adapt to many kinds of systems. +\`configure' configures yast2-fingerprint-reader 2.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1426,7 +1426,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-fingerprint-reader 2.22.1:";; + short | recursive ) echo "Configuration of yast2-fingerprint-reader 2.22.2:";; esac cat <<\_ACEOF @@ -1542,7 +1542,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-fingerprint-reader configure 2.22.1 +yast2-fingerprint-reader configure 2.22.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1995,7 +1995,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-fingerprint-reader $as_me 2.22.1, which was +It was created by yast2-fingerprint-reader $as_me 2.22.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2925,7 +2925,7 @@ # Define the identity of the package. PACKAGE='yast2-fingerprint-reader' - VERSION='2.22.1' + VERSION='2.22.2' cat >>confdefs.h <<_ACEOF @@ -3047,7 +3047,7 @@ -VERSION="2.22.1" +VERSION="2.22.2" RPMNAME="yast2-fingerprint-reader" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -16615,7 +16615,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-fingerprint-reader $as_me 2.22.1, which was +This file was extended by yast2-fingerprint-reader $as_me 2.22.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16681,7 +16681,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-fingerprint-reader config.status 2.22.1 +yast2-fingerprint-reader config.status 2.22.2 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-fingerprint-reader-2.22.2/configure.in new/yast2-fingerprint-reader-2.22.3/configure.in --- old/yast2-fingerprint-reader-2.22.2/configure.in 2012-03-26 07:50:54.000000000 +0200 +++ new/yast2-fingerprint-reader-2.22.3/configure.in 2012-04-10 10:39:49.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-fingerprint-reader, 2.22.1, http://bugs.opensuse.org/, yast2-fingerprint-reader) +AC_INIT(yast2-fingerprint-reader, 2.22.2, http://bugs.opensuse.org/, yast2-fingerprint-reader) 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.22.1" +VERSION="2.22.2" RPMNAME="yast2-fingerprint-reader" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fingerprint-reader-2.22.2/fingerprint-reader.pot new/yast2-fingerprint-reader-2.22.3/fingerprint-reader.pot --- old/yast2-fingerprint-reader-2.22.2/fingerprint-reader.pot 2011-10-05 10:06:54.000000000 +0200 +++ new/yast2-fingerprint-reader-2.22.3/fingerprint-reader.pot 2012-03-30 11:24:07.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-05 10:06+0200\n" +"POT-Creation-Date: 2012-03-30 11:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -106,7 +106,7 @@ #. error popup #: src/UsersPluginFingerprintReader.pm:253 #: src/UsersPluginFingerprintReader.pm:283 -msgid "Fingerprint reader is not configured. Run 'yast2-fingerprint-reader' to configure it" +msgid "Fingerprint reader is not configured. Run 'yast2-fingerprint-reader' to configure it." msgstr "" #. FingerprintReader summary dialog caption @@ -145,7 +145,7 @@ #. button label #: src/dialogs.ycp:109 -msgid "&Start User Management after finish" +msgid "&Start User Management after Finish" msgstr "" #. Command line help text for the Xfingerprint-reader module @@ -172,7 +172,7 @@ #: src/helps.ycp:40 msgid "" "<p><b>Initializing Fingerprint Reader Configuration</b><br>\n" -"Please wait...<br></p>\n" +"</p>\n" msgstr "" #. Read dialog help 2/2 @@ -186,11 +186,11 @@ #: src/helps.ycp:50 msgid "" "<p><b>Saving Fingerprint Reader Configuration</b><br>\n" -"Please wait...<br></p>\n" +"</p>\n" msgstr "" #. Write dialog help 2/2 -#: src/helps.ycp:54 +#: src/helps.ycp:55 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -199,120 +199,120 @@ msgstr "" #. help text for fingerprint reader plugin -#: src/users_plugin_fingerprint_reader.ycp:55 +#: src/users_plugin_fingerprint_reader.ycp:75 msgid "" "<p>Swipe your finger on the fingerprint reader. Three successful attempts \n" "are needed to save the new fingerprint.</p>" msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:69 +#: src/users_plugin_fingerprint_reader.ycp:89 msgid "Initializing fingerprint reader..." msgstr "" #. status label (canceled after user action) -#: src/users_plugin_fingerprint_reader.ycp:112 -#: src/users_plugin_fingerprint_reader.ycp:240 +#: src/users_plugin_fingerprint_reader.ycp:132 +#: src/users_plugin_fingerprint_reader.ycp:260 msgid "Canceled" msgstr "" -#: src/users_plugin_fingerprint_reader.ycp:131 +#: src/users_plugin_fingerprint_reader.ycp:151 msgid "Initialization of fingerprint reader failed." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:136 +#: src/users_plugin_fingerprint_reader.ycp:156 msgid "Device initialized." msgstr "" #. status message -#: src/users_plugin_fingerprint_reader.ycp:138 +#: src/users_plugin_fingerprint_reader.ycp:158 msgid "Swipe your right index finger." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:151 +#: src/users_plugin_fingerprint_reader.ycp:171 msgid "Storing data..." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:159 -#: src/users_plugin_fingerprint_reader.ycp:181 -#: src/users_plugin_fingerprint_reader.ycp:190 -#: src/users_plugin_fingerprint_reader.ycp:200 +#: src/users_plugin_fingerprint_reader.ycp:179 +#: src/users_plugin_fingerprint_reader.ycp:201 +#: src/users_plugin_fingerprint_reader.ycp:210 +#: src/users_plugin_fingerprint_reader.ycp:220 msgid "Scan failed." msgstr "" #. status message -#: src/users_plugin_fingerprint_reader.ycp:161 -#: src/users_plugin_fingerprint_reader.ycp:170 +#: src/users_plugin_fingerprint_reader.ycp:181 +#: src/users_plugin_fingerprint_reader.ycp:190 msgid "Swipe finger again." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:168 +#: src/users_plugin_fingerprint_reader.ycp:188 msgid "Enroll stage passed." msgstr "" #. status message (%1 is number) -#: src/users_plugin_fingerprint_reader.ycp:173 +#: src/users_plugin_fingerprint_reader.ycp:193 #, ycp-format msgid "Successful swipes: %1" msgstr "" #. status message -#: src/users_plugin_fingerprint_reader.ycp:183 +#: src/users_plugin_fingerprint_reader.ycp:203 msgid "Swipe was too short, try again." msgstr "" #. status message -#: src/users_plugin_fingerprint_reader.ycp:192 +#: src/users_plugin_fingerprint_reader.ycp:212 msgid "Center your finger on the sensor and try again." msgstr "" #. status message -#: src/users_plugin_fingerprint_reader.ycp:202 +#: src/users_plugin_fingerprint_reader.ycp:222 msgid "Remove your finger from the sensor and try again." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:209 -#: src/users_plugin_fingerprint_reader.ycp:219 +#: src/users_plugin_fingerprint_reader.ycp:229 +#: src/users_plugin_fingerprint_reader.ycp:239 msgid "Acquiring fingerprint failed." msgstr "" #. status label -#: src/users_plugin_fingerprint_reader.ycp:251 +#: src/users_plugin_fingerprint_reader.ycp:271 msgid "Fingerprint acquired successfully." msgstr "" #. error message, part 1 -#: src/users_plugin_fingerprint_reader.ycp:260 +#: src/users_plugin_fingerprint_reader.ycp:280 msgid "Could not acquire fingerprint." msgstr "" #. error message, part 2 -#: src/users_plugin_fingerprint_reader.ycp:265 +#: src/users_plugin_fingerprint_reader.ycp:285 msgid "Initialization failed." msgstr "" #. error message, part 2 -#: src/users_plugin_fingerprint_reader.ycp:268 +#: src/users_plugin_fingerprint_reader.ycp:288 msgid "No devices detected." msgstr "" #. error message, part 2 -#: src/users_plugin_fingerprint_reader.ycp:271 +#: src/users_plugin_fingerprint_reader.ycp:291 msgid "Device could not be opened." msgstr "" #. error message, part 2 -#: src/users_plugin_fingerprint_reader.ycp:274 +#: src/users_plugin_fingerprint_reader.ycp:294 msgid "USB error occurred." msgstr "" #. error message, part 2 -#: src/users_plugin_fingerprint_reader.ycp:277 +#: src/users_plugin_fingerprint_reader.ycp:297 msgid "Communication with fingerprint reader failed." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fingerprint-reader-2.22.2/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.22.3/src/users_plugin_fingerprint_reader.ycp --- old/yast2-fingerprint-reader-2.22.2/src/users_plugin_fingerprint_reader.ycp 2012-03-29 14:40:08.000000000 +0200 +++ new/yast2-fingerprint-reader-2.22.3/src/users_plugin_fingerprint_reader.ycp 2012-04-10 16:13:34.000000000 +0200 @@ -89,7 +89,9 @@ `Label (`id (`label), _("Initializing fingerprint reader...")) ), `ReplacePoint (`id (`rpstatus), `VSpacing ()), - `PushButton (`id (`cancel), Label::CancelButton ()), + `ReplacePoint (`id (`rpbutton), + `PushButton (`id (`cancel), Label::CancelButton ()) + ), `ReplacePoint (`id (`rpswipes), `VSpacing ()), `VSpacing (0.5) ), @@ -104,8 +106,8 @@ Label::CancelButton(), Label::OKButton()); Wizard::HideAbortButton (); + Wizard::HideBackButton (); Wizard::DisableNextButton (); - Wizard::DisableBackButton (); boolean exit = false; any ui = nil; @@ -143,6 +145,12 @@ UI::ReplaceWidget (`id (`rpstatus), `Label (message)); } + // retry acquiring fingerprint + boolean retry = true; + while (retry) + { + retry = false; + if (SCR::Execute (.fprint.enroll, fingerprint_dir) != true) { ui = `cancel; @@ -271,8 +279,8 @@ UI::ReplaceWidget (`id (`rp), `Label (_("Fingerprint acquired successfully."))); UI::ReplaceWidget (`id (`rpstatus), `Label ("")); // new id was already saved - Wizard::DisableBackButton (); Wizard::EnableNextButton (); + UI::ChangeWidget (`id (`cancel), `Enabled, false); } else { @@ -299,10 +307,25 @@ { status_message (error, details); } - Wizard::EnableBackButton (); + if (ui == `cancel) + { + UI::ChangeWidget (`id (`cancel), `Enabled, false); + } + else + { + // button label + UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`retry), _("Retry"))); + Wizard::RestoreBackButton (); + } } - UI::ChangeWidget (`id (`cancel), `Enabled, false); - ret = UI::UserInput (); + if (ui != `cancel) + { + ret = UI::UserInput (); + } + else + { + ret = `cancel; + } if (ret == `next) { // modified data to add to user @@ -316,6 +339,13 @@ else if (data["what"]:"" == "add_user") Users::AddUser (tmp_data); } + else if (ret == `retry) + { + UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`cancel), Label::CancelButton ())); + Wizard::HideBackButton (); + retry = true; + } + } Wizard::CloseDialog (); } y2milestone("users plugin finished with %1", ret); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org