devserver.py: Move ExtractTarball to cros_build_lib.
BUG=chromium:925203, chromium:1141320
TEST=./devserver_integration_test.py
Cq-Depend: chromium:2501981, chromium:2489405
Change-Id: Ia1606e93dc4d31a1c6cec21f00a044879c8a9254
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2501981
Tested-by: Eliot Courtney <edcourtney@chromium.org>
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/devserver.py b/devserver.py
index 23eb4fc..d713780 100755
--- a/devserver.py
+++ b/devserver.py
@@ -44,6 +44,7 @@
# anything from chromite. Otherwise, really bad things will happen, and
# you will _not_ understand why.
import setup_chromite # pylint: disable=unused-import
+from chromite.lib import cros_build_lib
from chromite.lib.xbuddy import android_build
from chromite.lib.xbuddy import artifact_info
from chromite.lib.xbuddy import build_artifact
@@ -724,8 +725,8 @@
# This dep does not exist (could be new), do not extract it.
continue
try:
- common_util.ExtractTarball(dep_path, telemetry_path)
- except common_util.CommonUtilError as e:
+ cros_build_lib.ExtractTarball(dep_path, telemetry_path)
+ except cros_build_lib.TarballError as e:
shutil.rmtree(telemetry_path)
raise DevServerError(str(e))
