Skip to content

Commit

Permalink
Revert "Update main.py"
Browse files Browse the repository at this point in the history
This reverts commit d649897.
  • Loading branch information
aaronatp committed Nov 13, 2023
1 parent 4acd8cd commit 88d725f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions capa/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def new_print(*args, **kwargs):
inspect.builtins.print = old_print # type: ignore


<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
def catch_log_return_errors(func):
Expand Down Expand Up @@ -201,6 +202,8 @@ def logging_wrapper(exception):
else:
return func(*args, **kwargs)
=======
=======
>>>>>>> parent of 50b4b067 (Updated handling for logging Unsupported Format, Arch, and OS)
def log_unsupported_format_error():
logger.error("-" * 80)
logger.error(" Input file does not appear to be a PE or ELF file.")
Expand Down Expand Up @@ -228,6 +231,9 @@ def log_unsupported_arch_error():
logger.error(" ")
logger.error(" capa currently only supports analyzing x86 (32- and 64-bit).")
logger.error("-" * 80)
<<<<<<< HEAD
>>>>>>> parent of 50b4b067 (Updated handling for logging Unsupported Format, Arch, and OS)
=======
>>>>>>> parent of 50b4b067 (Updated handling for logging Unsupported Format, Arch, and OS)


Expand Down

0 comments on commit 88d725f

Please sign in to comment.