[plague] Wait max. 60 s for Mock state.log to appear (prev. 15 s).

[Michael Schwendt]

commit b8185815e5775d3411bdec2989921f7cbbd346b6
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Mar 2 01:52:15 2015 +0100

    Wait max. 60 s for Mock state.log to appear (prev. 15 s).
    
    - Ignore SSL.Error exceptions in recv().

 plague-0.4.5.8-fedora-mock-state.patch    | 12 ++++++++++--
 plague-0.4.5.8-wakeup-serve_forever.patch | 16 ++++++++++++++--
 plague.spec                               |  6 +++++-
 3 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/plague-0.4.5.8-fedora-mock-state.patch b/plague-0.4.5.8-fedora-mock-state.patch
index 8808385..e44ffbb 100644
--- a/plague-0.4.5.8-fedora-mock-state.patch
+++ b/plague-0.4.5.8-fedora-mock-state.patch
@@ -1,6 +1,6 @@
 diff -Nur plague-0.4.5.8-orig/builder/builder.py plague-0.4.5.8/builder/builder.py
 --- plague-0.4.5.8-orig/builder/builder.py	2010-05-05 12:45:20.000000000 +0200
-+++ plague-0.4.5.8/builder/builder.py	2015-02-28 11:40:40.226331650 +0100
++++ plague-0.4.5.8/builder/builder.py	2015-03-02 01:46:22.511456796 +0100
 @@ -253,15 +253,6 @@
          self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None)
          self._status = 'cleanup'
@@ -43,7 +43,15 @@ diff -Nur plague-0.4.5.8-orig/builder/builder.py plague-0.4.5.8/builder/builder.
  
      def _read_mock_config(self):
          mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
-@@ -365,9 +357,7 @@
+@@ -359,15 +351,13 @@
+         # We need to make sure that mock has dumped the status file withing a certain
+         # amount of time, otherwise we can't tell what it's doing
+         if not os.path.exists(self._state_file):
+-            # something is wrong if mock takes more than 15s to write the status file
+-            if time.time() > self._mockstarttime + 15:
++            # something is wrong if mock takes more than 60s to write the status file
++            if time.time() > self._mockstarttime + 60:
+                 self._mockstarttime = 0
                  self._log("ERROR: Timed out waiting for the mock status file!  %s\n" % self._state_file)
                  self.die()
          else:
diff --git a/plague-0.4.5.8-wakeup-serve_forever.patch b/plague-0.4.5.8-wakeup-serve_forever.patch
index bce7e96..ba4fd3e 100644
--- a/plague-0.4.5.8-wakeup-serve_forever.patch
+++ b/plague-0.4.5.8-wakeup-serve_forever.patch
@@ -1,6 +1,6 @@
 diff -Nur plague-0.4.5.8-orig/builder/builder.py plague-0.4.5.8/builder/builder.py
 --- plague-0.4.5.8-orig/builder/builder.py	2010-05-05 12:45:20.000000000 +0200
-+++ plague-0.4.5.8/builder/builder.py	2013-04-22 15:35:24.683026931 +0200
++++ plague-0.4.5.8/builder/builder.py	2015-03-02 01:44:47.343591868 +0100
 @@ -799,6 +799,14 @@
      log("Received SIGTERM, quitting...\n")
      bserver.stop()
@@ -16,9 +16,21 @@ diff -Nur plague-0.4.5.8-orig/builder/builder.py plague-0.4.5.8/builder/builder.
  def main():
      global bserver
  
+diff -Nur plague-0.4.5.8-orig/common/SSLConnection.py plague-0.4.5.8/common/SSLConnection.py
+--- plague-0.4.5.8-orig/common/SSLConnection.py	2010-08-10 17:19:22.000000000 +0200
++++ plague-0.4.5.8/common/SSLConnection.py	2015-03-02 01:00:55.000000000 +0100
+@@ -149,6 +149,8 @@
+             except SSL.SysCallError, (e, err):
+                 time.sleep(0.2)
+                 return None
++            except Error:
++                return None
+         return None
+ 
+ class PlgFileObject(socket._fileobject):
 diff -Nur plague-0.4.5.8-orig/server/main.py plague-0.4.5.8/server/main.py
 --- plague-0.4.5.8-orig/server/main.py	2008-01-31 14:28:05.000000000 +0100
-+++ plague-0.4.5.8/server/main.py	2013-04-22 15:36:00.412107870 +0200
++++ plague-0.4.5.8/server/main.py	2015-03-02 01:44:47.365590682 +0100
 @@ -68,6 +68,14 @@
      print "Received SIGTERM, quitting..."
      bm_server.stop()
diff --git a/plague.spec b/plague.spec
index e6b7653..d1a2f02 100644
--- a/plague.spec
+++ b/plague.spec
@@ -6,7 +6,7 @@ BuildArch: noarch
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.8
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -185,6 +185,10 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %changelog
+* Mon Mar  2 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.8-23
+- Wait max. 60 s for Mock state.log to appear (prev. 15 s).
+- Ignore SSL.Error exceptions in recv().
+
 * Sat Feb 28 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.8-22
 - Builder upgrade revealed that Mock in Fedora has changed and creates a
   different state.log file than what has been compatible with Plague Builder.