Hello community,
here is the log from the commit of package yast2-fingerprint-reader
checked in at Mon Sep 29 18:27:16 CEST 2008.
--------
--- yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-09-26 16:29:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-09-29 16:04:21.795256000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 29 15:51:23 CEST 2008 - jsuchome@suse.cz
+
+- check the values returned by agent (fp_enroll_finger_img) in YCP
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-fingerprint-reader-2.17.1.tar.bz2
New:
----
yast2-fingerprint-reader-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fingerprint-reader.spec ++++++
--- /var/tmp/diff_new_pack.mr4979/_old 2008-09-29 18:27:09.000000000 +0200
+++ /var/tmp/diff_new_pack.mr4979/_new 2008-09-29 18:27:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-fingerprint-reader (Version 2.17.1)
+# spec file for package yast2-fingerprint-reader (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-fingerprint-reader
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-fingerprint-reader-2.17.1.tar.bz2
+Source0: yast2-fingerprint-reader-2.17.2.tar.bz2
Prefix: /usr
Requires: yast2 yast2-pam
BuildRequires: libfprint-devel libfprint0 libusb-devel
@@ -44,7 +44,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-fingerprint-reader-2.17.1
+%setup -n yast2-fingerprint-reader-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,9 @@
%{_libdir}/YaST2/plugin/libpy2ag_fprint.*
%doc %{prefix}/share/doc/packages/yast2-fingerprint-reader
%changelog
+* Mon Sep 29 2008 jsuchome@suse.cz
+- check the values returned by agent (fp_enroll_finger_img) in YCP
+- 2.17.2
* Fri Sep 26 2008 jsuchome@suse.cz
- initial version of agent based on linfprint library (fate#300416)
- 2.17.1
++++++ yast2-fingerprint-reader-2.17.1.tar.bz2 -> yast2-fingerprint-reader-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/agent-fprint/src/FPrintAgent.cc new/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc
--- old/yast2-fingerprint-reader-2.17.1/agent-fprint/src/FPrintAgent.cc 2008-09-26 16:17:45.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/agent-fprint/src/FPrintAgent.cc 2008-09-29 15:49:37.000000000 +0200
@@ -135,11 +135,16 @@
sleep (1);
y2internal ("Scan your finger now.");
+ // FIXME not possible, this is total number of stages
+ y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev));
+
r = fp_enroll_finger (dev, &enrolled_print);
if (r < 0) {
y2error ("Enroll failed with error %d", r);
-// break; FIXME what now?
+ instance().finalize ();
+ signal (15, SIG_DFL);
+ return r;
}
y2internal ("retval: %d", r);
if (write (write_fd, &r, sizeof (int)) == -1)
@@ -152,8 +157,9 @@
break;
case FP_ENROLL_FAIL:
y2milestone("Enroll failed, something wen't wrong :(");
-// return NULL; FIXME
- break;
+ instance().finalize ();
+ signal (15, SIG_DFL);
+ return r;
case FP_ENROLL_PASS:
y2milestone("Enroll stage passed. Yay!");
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp
--- old/yast2-fingerprint-reader-2.17.1/src/users_plugin_fingerprint_reader.ycp 2008-09-26 16:17:45.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/src/users_plugin_fingerprint_reader.ycp 2008-09-29 15:49:37.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_fingerprint_reader.ycp 51598 2008-09-26 14:05:42Z jsuchome $
+ * $Id: users_plugin_fingerprint_reader.ycp 51656 2008-09-29 13:50:29Z jsuchome $
*/
{
@@ -117,6 +117,7 @@
}
// helper function, form the string for UI from actuall data
+ // FIXME we don't know number of remaining swipes...
void replace_swipe_string () {
UI::ReplaceWidget (`id (`rpstatus), `Label (
@@ -125,6 +126,14 @@
swipe_success, swipe_failed)
));
}
+
+
+ void status_message (string label, string message) {
+ UI::ReplaceWidget (`id (`rp), `Label (label));
+ UI::ReplaceWidget (`id (`rpstatus), `Label (message));
+ }
+
+
if (SCR::Execute (.fprint.enroll, bir_path) != true)
{
ui = `cancel;
@@ -132,13 +141,16 @@
UI::ReplaceWidget (`id (`rp),
`Label (_("Initialization of fingerprint reader failed.")));
}
+// FIXME show generic message... the user can enroll finger
while (ui != `cancel)
{
map statemap = (map) SCR::Read (.fprint.state);
if (statemap != nil && statemap != $[])
{
integer state = statemap["state"]:0;
+y2security ("state: %1", state);
switch (state) {
+ /*
case 8: { // TF_STATE_ACQUIRE_SUCCESS
UI::ReplaceWidget (`id (`rp),
// status label
@@ -176,7 +188,7 @@
replace_swipe_string ();
break;
}
-
+ */
case 1: { // FP_ENROLL_COMPLETE
UI::ReplaceWidget (`id (`rp),
// status label
@@ -185,13 +197,70 @@
exit = true;
break;
}
- case -1: { // FP_ENROLL_FAIL FIXME
- UI::ReplaceWidget (`id (`rp),
- `Label (_("Acquiring fingerprint failed.")));
+ case 2: { // FP_ENROLL_FAILED ?? FIXME
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Swipe finger again."));
+ break;
+ }
+ case 3: { // FP_ENROLL_PASS
+ swipe_success = swipe_success + 1;
+// replace_swipe_string ();
+
+ status_message (
+ // status label
+ _("Enroll stage passed."),
+ // status message
+ _("Swipe finger again."));
+ break;
+ }
+ case 101: { // FP_ENROLL_RETRY_TOO_SHORT:
+
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Swipe was too short, try again."));
+ break;
+ }
+ case 102: { // FP_ENROLL_RETRY_CENTER_FINGER:
+
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Center your finger on the sensor and try again."));
+ break;
+ }
+ case 103: { // FP_ENROLL_RETRY_REMOVE_FINGER:
+
+ // status message
+ status_message (
+ // status label
+ _("Scan failed."),
+ // status message
+ _("Remove your finger and try again."));
+ break;
+ }
+ case -1: { // FP_ENROLL_FAIL
+ // some fatal error
+ status_message (
+ // status label
+ _("Acquiring fingerprint failed."), "");
exit = true;
break;
}
}
+ if (state < -1)
+ {
+ // some fatal error
+ status_message (
+ // status label
+ _("Acquiring fingerprint failed."), "");
+ exit = true;
+ }
}
else if (statemap == nil)
{
@@ -217,10 +286,6 @@
sleep (100);
}
y2milestone ("agent exit status: %1", exit_status);
-// FIXME FIXME
- // 9 is failed acquire, 253 is USB error, 254 communication error
- // FIXME what's the meaning of TF_STATE_ENROLL_SUCCESS (7)?
-// if (exit_status == 7 || exit_status == 8)
if (exit_status == 1)
{
// status label
@@ -253,6 +318,7 @@
ret = UI::UserInput ();
if (ret == `next)
{
+ // FIXME no bir file can be defined yet FIXME
// modified data to add to user
map tmp_data = $[
"bir_file" : username,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.1/VERSION new/yast2-fingerprint-reader-2.17.2/VERSION
--- old/yast2-fingerprint-reader-2.17.1/VERSION 2008-09-26 16:18:27.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.2/VERSION 2008-09-29 15:53:13.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org