Reverting changes in PR ##2391.
authorSteven Black <redacted>
Thu, 27 Jul 2023 19:34:13 +0000 (15:34 -0400)
committerSteven Black <redacted>
Thu, 27 Jul 2023 19:34:13 +0000 (15:34 -0400)
updateHostsFile.py

index 986f2023a3737ba7e32f7926c864381b37cbfcc3..5c8271492cf70845f40d87437ee5914910ce4847 100755 (executable)
@@ -1061,7 +1061,7 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
     """
     first try: IP followed by domain
     """
-    regex = r"^\s*(\d{1,3}\.){3}\d{1,3}\s+((?:\w+\.)+[a-zA-Z]+)(.*)"
+    regex = r"^\s*(\d{1,3}\.){3}\d{1,3}\s+([\w\.-]+[a-zA-Z])(.*)"
     result = re.search(regex, rule)
 
     if result:
@@ -1090,7 +1090,7 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
     """
     # deny any potential IPv6 address here.
     if ":" not in rule:
-        regex = r"^\s*((?:\w+\.)+[a-zA-Z]+)(.*)"
+        regex = r"^\s*([\w\.-]+[a-zA-Z])(.*)"
         result = re.search(regex, rule)
 
         if result:
git clone https://git.99rst.org/PROJECT