Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41291 - in /branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader: ./ agent-thinkfinger/src/ package/ src/
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Tue, 09 Oct 2007 14:11:02 -0000
  • Message-id: <20071009141102.37E6617436@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Tue Oct  9 16:11:01 2007
New Revision: 41291

URL: http://svn.opensuse.org/viewcvs/yast?rev=41291&view=rev
Log:
- Backport 2.15.2 version for SLE10 (F302658)
- do not use Pam.ycp, PAM settings are written by pam_thinkfigner
- Cancel button: send the child process SIGKILL when it is still
  alive 3 seconds after SIGTERM
- 2.13.0


Modified:
    branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc
    branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes
    branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp
    branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/yast2-fingerprint-reader.spec.in

Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc?rev=41291&r1=41290&r2=41291&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc (original)
+++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc Tue Oct  9 16:11:01 2007
@@ -182,19 +182,15 @@
        }
        // wait for child exit
        else if (PC(0) == "exit_status" ) {
-y2internal ("waiting for child exit...");
            int status;
            int retval  = 255;
-//FIXME in case of
-//Warning: usb_bulk_read expected to read 0x40 (read 0x34 bytes).
-//child doesn't exit...
            wait (&status);
            if (WIFSIGNALED (status))
                y2milestone ("child process was killed");
            else if (WIFEXITED (status))
            {
                retval  = WEXITSTATUS (status);
-y2milestone ("retval is %d", retval);
+               y2milestone ("retval is %d", retval);
            }
            ret = YCPInteger (retval);
            close (data_pipe[0]); // close FD for reading
@@ -230,10 +226,25 @@
     if (path->length() == 1) {
  
        if (PC(0) == "cancel") {
-y2internal ("killing child process with pid %d", child_pid);
+           y2milestone ("terminanting child process with pid %d", child_pid);
            if (child_pid)
-               kill (child_pid, 15);
-           child_pid   = -1;
+           {
+               if (kill (child_pid, 15) != -1)
+               {
+                   sleep (3);
+                   int status;
+                   if (waitpid (-1, &status, WNOHANG) == 0)
+                   {
+                       y2milestone ("... still alive, killing it", child_pid);
+                       kill (child_pid, 9);
+                   }
+                   child_pid   = -1;
+               }
+               else
+               {
+                   y2error ("error while killing: %d (%m)", errno);
+               }
+           }
            ret = YCPBoolean (true);
        }
        /**

Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes?rev=41291&r1=41290&r2=41291&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes Tue Oct  9 16:11:01 2007
@@ -2,5 +2,8 @@
 Tue Oct  2 13:48:59 CEST 2007 - jsuchome@xxxxxxx
 
 - Backport 2.15.2 version for SLE10 (F302658)
+- do not use Pam.ycp, PAM settings are written by pam_thinkfigner
+- Cancel button: send the child process SIGKILL when it is still
+  alive 3 seconds after SIGTERM
 - 2.13.0
 

Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp?rev=41291&r1=41290&r2=41291&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Tue Oct  9 16:11:01 2007
@@ -156,7 +156,6 @@
            }
            else if (statemap == nil)
            {
-y2internal ("statemap is nil - error?");
                exit_status = (integer) SCR::Read (.thinkfinger.exit_status);
                break;
            }
@@ -171,7 +170,7 @@
            if (ui == `cancel || ui == `back)
            {
                SCR::Execute (.thinkfinger.cancel);
-               y2internal ("exit status after cancel: %1", SCR::Read (.thinkfinger.exit_status));
+               y2milestone ("exit status after cancel: %1", SCR::Read (.thinkfinger.exit_status));
                break;
            }
            sleep (100);

Modified: branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/yast2-fingerprint-reader.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/yast2-fingerprint-reader.spec.in?rev=41291&r1=41290&r2=41291&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/yast2-fingerprint-reader.spec.in (original)
+++ branches/SuSE-SLE-10-SP1-Branch/fingerprint-reader/yast2-fingerprint-reader.spec.in Tue Oct  9 16:11:01 2007
@@ -2,10 +2,11 @@
 
 @HEADER@
 Requires:      yast2 yast2-pam
-BuildRequires: libthinkfinger libusb-devel
+BuildRequires: libthinkfinger
+#libusb-devel
 BuildRequires: doxygen gcc-c++ yast2-core-devel perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-pam
 
-Conflicts:     yast2-hardware-detection < 2.15.7
+Conflicts:     yast2-hardware-detection < 2.13.8
 
 Summary:       Configuration of fingerprint reader
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages