From ab87132aa38b8405f46e4120497842e0ecd35dab Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 30 Nov 2023 16:47:02 +0000 Subject: [PATCH] Backed out changeset fec3dc168176 (bug 1866176) for causing bug 1867494 CLOSED TREE UltraBlame original commit: 83540410d1e22cc835d53d6657dd072b4a166d7f --- python/mozbuild/mozpack/files.py | 17 ---------------- python/mozlint/mozlint/cli.py | 35 ++++++++++---------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py index 75ae516aba9a7..03e3c0e8c8a62 100644 --- a/python/mozbuild/mozpack/files.py +++ b/python/mozbuild/mozpack/files.py @@ -5022,12 +5022,7 @@ . base = -mozpath -. -normsep -( base -) self . @@ -5944,19 +5939,7 @@ . ignore = -tuple -( -mozpath -. -normsep -( -path -) -for -path -in ignore -) self . diff --git a/python/mozlint/mozlint/cli.py b/python/mozlint/mozlint/cli.py index 803c8bf4171d6..a9c7f886256d7 100644 --- a/python/mozlint/mozlint/cli.py +++ b/python/mozlint/mozlint/cli.py @@ -2833,13 +2833,13 @@ result . returncode -def -main -( -) -- -> -int +if +__name__ += += +" +__main__ +" : parser @@ -2859,27 +2859,14 @@ ) ) -return -run -( -* -* -args -) -if -__name__ -= -= -" -__main__ -" -: - sys . exit ( -main +run ( +* +* +args ) )