commit e61cbe9123799510fd522ddfa0b78d237da85a35
author Yu-Ju Hong <yjhong@google.com> Tue Jul 10 14:10:26 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jul 10 18:47:55 2012 -0700
tree 26da273caafaba31030d42b457dd0d7869fc9853
parent 2f1c41ef7e74d57ab612d936df958db39f3f6447

Support both autotest.tar and autotest.tar.bz2 at Dev server

This change favors the use of autotest.tar if it is available. The script falls
back to using autotest.tar.bz2 in other cases for backward compatibility.

BUG=chromium-os:32312
TEST=unittest & download using local devserver

Change-Id: I6c4590375a814a83a33ec84693e1cb6231752845
Reviewed-on: https://gerrit.chromium.org/gerrit/27076
Commit-Ready: Yu-Ju Hong <yjhong@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>

downloadable_artifact.py

diff --git a/downloadable_artifact.py b/downloadable_artifact.py
index bf16885..9251c43 100644
--- a/downloadable_artifact.py
+++ b/downloadable_artifact.py
@@ -6,6 +6,7 @@
 
 import cherrypy
 import os
+import re
 import shutil
 import subprocess
 
@@ -17,7 +18,8 @@
 STATEFUL_UPDATE = 'stateful.tgz'
 TEST_IMAGE = 'chromiumos_test_image.bin'
 ROOT_UPDATE = 'update.gz'
-AUTOTEST_PACKAGE = 'autotest.tar.bz2'
+AUTOTEST_PACKAGE = 'autotest.tar'
+AUTOTEST_ZIPPED_PACKAGE = 'autotest.tar.bz2'
 TEST_SUITES_PACKAGE = 'test_suites.tar.bz2'
 
 
@@ -88,11 +90,22 @@
   """Wrapper around an artifact to download from gsutil which is a tarball."""
 
   def _ExtractTarball(self, exclude=None):
-    """Extracts the tarball into the install_path with optional exclude path."""
+    """Detects whether the tarball is compressed or not based on the file
+    extension and extracts the tarball into the install_path with optional
+    exclude path."""
+
     exclude_str = '--exclude=%s' % exclude if exclude else ''
-    cmd = 'tar xf %s %s --use-compress-prog=pbzip2 --directory=%s' % (
-        self._tmp_stage_path, exclude_str, self._install_path)
+    tarball = os.path.basename(self._tmp_stage_path)
+
+    if re.search('.tar.bz2$', tarball):
+      compress_str = '--use-compress-prog=pbzip2'
+    else:
+      compress_str = ''
+
+    cmd = 'tar xf %s %s %s --directory=%s' % (
+        self._tmp_stage_path, exclude_str, compress_str, self._install_path)
     msg = 'An error occurred when attempting to untar %s' % self._tmp_stage_path
+
     try:
       subprocess.check_call(cmd, shell=True)
     except subprocess.CalledProcessError, e: