commit a2ccaa56726b3e4f488882353b879d9e8aa50158
author Bob Lantz <rlantz@cs.stanford.edu> Wed Jun 29 18:26:06 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 30 20:58:13 2016 +0000
tree 4ec997b5683ea495a47a9e3977aff847b1d20a6f
parent ea6a8254ed5ddf6f094d5f7112a737cdcdca18ee

unpackONOS: check for failure when extracting tar archive

Change-Id: Iad44ac863449afdbf21d8766479af569f9ba9b6e

tools/dev/mininet/onos.py

diff --git a/tools/dev/mininet/onos.py b/tools/dev/mininet/onos.py
index 8e163ad..6314eb0 100755
--- a/tools/dev/mininet/onos.py
+++ b/tools/dev/mininet/onos.py
@@ -135,9 +135,13 @@
         raise Exception( 'Missing ONOS tarball %s - run buck build onos?'
                          % tarPath )
     info( '(unpacking %s)' % destDir)
-    cmds = ( 'mkdir -p "%s" && cd "%s" && tar xzf "%s"'
-             % ( destDir, destDir, tarPath) )
-    run( cmds, shell=True, verbose=True )
+    success = '*** SUCCESS ***'
+    cmds = ( 'mkdir -p "%s" && cd "%s" && tar xzf "%s" && echo "%s"'
+             % ( destDir, destDir, tarPath, success ) )
+    result = run( cmds, shell=True, verbose=True )
+    if success not in result:
+        raise Exception( 'Failed to unpack ONOS archive %s in %s:\n%s\n' %
+                         ( tarPath, destDir, result ) )
     # We can use quietRun for this usually
     tarOutput = quietRun( 'tar tzf "%s" | head -1' % tarPath, shell=True)
     tarOutput = tarOutput.split()[ 0 ].strip()