Skip to content

Commit 5edd6e4

Browse files
committed
changing blacklist matching to use regex
1 parent 675b47d commit 5edd6e4

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

core/src/main/python/wlsdeploy/tool/create/domain_typedef.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
The Universal Permissive License (UPL), Version 1.0
44
"""
55
import javaos as os
6+
import re
67

78
from java.lang import IllegalArgumentException
89

@@ -216,12 +217,10 @@ def _is_system_name(self, name, key):
216217
if key in self._system_elements:
217218
system_names = self._system_elements[key]
218219
for system_name in system_names:
219-
if system_name.endswith(self.__wild_card_suffix):
220-
prefix = system_name[0:0 - self.__wild_card_suffix_len]
221-
if name.startswith(prefix):
222-
return True
223-
elif system_name == name:
220+
matched = re.match(system_name, name)
221+
if matched is not None:
224222
return True
223+
225224
return False
226225

227226
def __resolve_paths(self):

0 commit comments

Comments
 (0)