OSS-Fuzz integration (#1930)

[etc/vim.git] / src / black_primer / lib.py

diff --git a/src/black_primer/lib.py b/src/black_primer/lib.py
index 913f9d5a181de38cc4a24467af9b7471833d0b63..c3069812b224d74f16e183300cf3ff015982c0a3 100644 (file)
--- a/src/black_primer/lib.py
+++ b/src/black_primer/lib.py
@@ -21,7 +21,7 @@ import click
 
 WINDOWS = system() == "Windows"
 BLACK_BINARY = "black.exe" if WINDOWS else "black"
 
 WINDOWS = system() == "Windows"
 BLACK_BINARY = "black.exe" if WINDOWS else "black"

-GIT_BIANRY = "git.exe" if WINDOWS else "git"
+GIT_BINARY = "git.exe" if WINDOWS else "git"

 LOG = logging.getLogger(__name__)
 
 
 LOG = logging.getLogger(__name__)
 
 


@@ -59,10 +59,12 @@ async def _gen_check_output(
         raise
 
     if process.returncode != 0:
         raise
 
     if process.returncode != 0:

+        returncode = process.returncode
+        if returncode is None:
+            returncode = 69
+

         cmd_str = " ".join(cmd)
         cmd_str = " ".join(cmd)

-        raise CalledProcessError(
-            process.returncode, cmd_str, output=stdout, stderr=stderr
-        )
+        raise CalledProcessError(returncode, cmd_str, output=stdout, stderr=stderr)

 
     return (stdout, stderr)
 
 
     return (stdout, stderr)
 


@@ -131,6 +133,10 @@ async def black_run(
             else:
                 results.stats["success"] += 1
             return
             else:
                 results.stats["success"] += 1
             return

+        elif cpe.returncode > 1:
+            results.stats["failed"] += 1
+            results.failed_projects[repo_path.name] = cpe
+            return

 
         LOG.error(f"Unknown error with {repo_path}")
         raise
 
         LOG.error(f"Unknown error with {repo_path}")
         raise


@@ -154,7 +160,7 @@ async def git_checkout_or_rebase(
     depth: int = 1,
 ) -> Optional[Path]:
     """git Clone project or rebase"""
     depth: int = 1,
 ) -> Optional[Path]:
     """git Clone project or rebase"""

-    git_bin = str(which(GIT_BIANRY))
+    git_bin = str(which(GIT_BINARY))

     if not git_bin:
         LOG.error("No git binary found")
         return None
     if not git_bin:
         LOG.error("No git binary found")
         return None