From a9c4ff9faf36a95c4d6332bd2ac6c042ea72419f Mon Sep 17 00:00:00 2001
From: Jaime Fullaondo <jaime.fullaondo@datadoghq.com>
Date: Wed, 16 Aug 2017 14:19:23 +0200
Subject: [PATCH] [oracle] fix helper script on linux - handle weird exception.

---
 oracle/ci/resources/get_instantclient.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/oracle/ci/resources/get_instantclient.py b/oracle/ci/resources/get_instantclient.py
index 47fa74199b5f9..62e826d0b6044 100755
--- a/oracle/ci/resources/get_instantclient.py
+++ b/oracle/ci/resources/get_instantclient.py
@@ -97,10 +97,14 @@ def main():
     sys.stdout.flush()
     npm.logfile = sys.stdout
     if 'linux' in platform.system().lower():
-        npm.expect(u'updated 1 package', timeout=120)
+        npm.expect(u'instantclient@', timeout=120)
 
-    npm.expect(pexpect.EOF, timeout=120)
-    sys.stdout.flush()
+    try:
+        npm.expect(pexpect.EOF, timeout=120)
+    except Exception:
+        pass
+    finally:
+        sys.stdout.flush()
 
     print 'InstantClient installation complete.'