No Issue - Basilisk is dead. Directive 4 is Pale Moon only!

1 files changed, 22 insertions, 27 deletions

diff --git a/build/directive4.py b/build/directive4.py
index 5fdcbad35..e32b5b3a9 100644
--- a/build/directive4.py
+++ b/build/directive4.py
@@ -10,8 +10,8 @@ import sys
 
 # Sanity check
 if not len(sys.argv) > 1:
-    print("Incorrect number of arguments")
-    sys.exit(1)
+  print("Incorrect number of arguments")
+  sys.exit(1)
 
 # Vars
 listConfigure = sys.argv[1:]
@@ -21,34 +21,29 @@ listViolations = []
 
 # Build a list of set configure variables
 for _value in listConfigure:
-    _splitString = _value.split("=")
+  _splitString = _value.split("=")
 
-    if _splitString[1] == "1":
-        listConfig += [ _splitString[0] ]
-    elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
-        strBrandingDirectory = _splitString[1]
+  if _splitString[1] == "1":
+    listConfig += [ _splitString[0] ]
+  elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
+    strBrandingDirectory = _splitString[1]
 
 # Only applies if using Official Branding or specific branding directories
-if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):
-    # Applies to Pale Moon and Basilisk
-    if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
-        listViolations += [
-            'MOZ_SYSTEM_JPEG',
-            'MOZ_SYSTEM_ZLIB',
-            'MOZ_SYSTEM_BZ2',
-            'MOZ_SYSTEM_JEMALLOC'
-        ]
-        
-    # Anything that applies to Pale Moon only goes here
-    if 'MC_PALEMOON' in listConfig:
-        listViolations += [
-        ]
-    
-    # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
-    for _value in listViolations:
-        if _value in listConfig:
-            sys.stdout.write("1")
-            sys.exit(1)
+if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):  
+  # Anything that applies to Pale Moon only goes here
+  if 'MC_PALEMOON' in listConfig:
+    listViolations += [
+      'MOZ_SYSTEM_JPEG',
+      'MOZ_SYSTEM_ZLIB',
+      'MOZ_SYSTEM_BZ2',
+      'MOZ_SYSTEM_JEMALLOC'
+    ]
+  
+  # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
+  for _value in listViolations:
+    if _value in listConfig:
+      sys.stdout.write("1")
+      sys.exit(1)
 
 # Exit outputting nothing to DIRECTIVE4 being empty because there are no violations
 sys.exit(0)