Add support for .tbz file extension in repository_ctx.download_and_ex…

…tract The `download_and_extract` function supported `.tar.bz2` files, but did not recognize `.tbz` as a valid file extension for those. This commit simply adds support for this, in the code, in the test and in the doc.
bazelbuild · Mar 27, 2023 · ba3d741 · ba3d741
1 parent 952438d
commit ba3d741
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java
@@ -102,15 +102,15 @@ static Decompressor getDecompressor(Path archivePath) throws RepositoryFunctionE
       return TarXzFunction.INSTANCE;
     } else if (baseName.endsWith(".tar.zst") || baseName.endsWith(".tzst")) {
       return TarZstFunction.INSTANCE;
-    } else if (baseName.endsWith(".tar.bz2")) {
+    } else if (baseName.endsWith(".tar.bz2") || baseName.endsWith(".tbz")) {
       return TarBz2Function.INSTANCE;
     } else if (baseName.endsWith(".ar") || baseName.endsWith(".deb")) {
       return ArFunction.INSTANCE;
     } else {
       throw new RepositoryFunctionException(
           Starlark.errorf(
               "Expected a file with a .zip, .jar, .war, .aar, .tar, .tar.gz, .tgz, .tar.xz, .txz,"
-                  + " .tar.zst, .tzst, .tar.bz2, .ar or .deb suffix (got %s)",
+                  + " .tar.zst, .tzst, .tar.bz2, .tbz, .ar or .deb suffix (got %s)",
               archivePath),
           Transience.PERSISTENT);
     }

diff --git a/.../com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java b/.../com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java
@@ -569,7 +569,7 @@ public StructImpl download(
                     + " the URL."
                     + " If the file has no extension, you can explicitly specify either \"zip\","
                     + " \"jar\", \"war\", \"aar\", \"tar\", \"tar.gz\", \"tgz\", \"tar.xz\","
-                    + " \"txz\", \".tar.zst\", \".tzst\", \"tar.bz2\", \".ar\", or \".deb\""
+                    + " \"txz\", \".tar.zst\", \".tzst\", \"tar.bz2\", \".tbz\", \".ar\", or \".deb\""
                     + " here."),
         @Param(
             name = "stripPrefix",

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java
@@ -57,6 +57,8 @@ public void testKnownFileExtensionsDoNotThrow() throws Exception {
     unused = DecompressorValue.getDecompressor(path);
     path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.tar.bz2");
     unused = DecompressorValue.getDecompressor(path);
+    path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.tbz");
+    unused = DecompressorValue.getDecompressor(path);
     path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.ar");
     unused = DecompressorValue.getDecompressor(path);
     path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.deb");