Author: jsuchome Date: Mon Oct 22 13:33:23 2007 New Revision: 41510 URL: http://svn.opensuse.org/viewcvs/yast?rev=41510&view=rev Log: fixed wrong widget id (#333670) - check for presence of bir files in import directory (#333670) - 2.16.0 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/FingerprintReader.ycp trunk/fingerprint-reader/src/dialogs.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=41510&r1=41509&r2=41510&view=diff ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Mon Oct 22 13:33:23 2007 @@ -1 +1 @@ -2.15.2 +2.16.0 Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes?rev=41510&r1=41509&r2=41510&view=diff ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Oct 22 13:33:23 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 10:18:32 CEST 2007 - jsuchome@suse.cz + +- fixed wrong widget id (#333670) +- check for presence of bir files in import directory (#333670) +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 15 09:12:05 CEST 2007 - jsuchome@suse.cz - use Pam module to check the status and FingerprintReader.ycp for Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/FingerprintReader.ycp?rev=41510&r1=41509&r2=41510&view=diff ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Mon Oct 22 13:33:23 2007 @@ -166,12 +166,19 @@ SCR::Execute (.target.mkdir, bir_dir); } map out = (map) SCR::Execute (.target.bash_output, - sformat ("/bin/cp %1/*.bir %2/", import_dir, bir_dir)); - if (out["stderr"]:"" != "") + sformat ("find \"%1\" -maxdepth 1 -name \"*.gz\" | wc -l", + import_dir)); + integer count = tointeger(deletechars(out["stdout"]:"0","\n")); + if (count != nil && count > 0) { - // error popup - Popup::ErrorDetails (_("Importing fingerprint files failed."), - out["stderr"]:""); + out = (map) SCR::Execute (.target.bash_output, + sformat ("/bin/cp %1/*.bir %2/", import_dir, bir_dir)); + if (out["stderr"]:"" != "") + { + // error popup + Popup::ErrorDetails (_("Importing fingerprint files failed."), + out["stderr"]:""); + } } } Modified: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.ycp?rev=41510&r1=41509&r2=41510&view=diff ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Mon Oct 22 13:33:23 2007 @@ -146,7 +146,7 @@ { if ((findlastof (dir, "/") + 1) == size(dir)) dir = substring (dir, 0, size(dir)-1); - UI::ChangeWidget (`id(`home), `Value, dir); + UI::ChangeWidget (`id(`import_dir), `Value, dir); } } else if (ret == `next) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org