Skip to content

Commit bb2e017

Browse files
Fix InvalidPackage handling
1 parent 66edd67 commit bb2e017

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

client/backend_arguments.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
from .configuration import search_path
3636

37+
from .configuration.exceptions import InvalidConfiguration
38+
3739
LOG: logging.Logger = logging.getLogger(__name__)
3840

3941
SERVER_ARTIFACT_ROOT_NAME: str = "link_trees"
@@ -69,7 +71,10 @@ def serialize(self) -> Dict[str, object]:
6971
}
7072

7173
def get_checked_directory_allowlist(self) -> Set[str]:
72-
return {element.path() for element in self.elements}
74+
try:
75+
return {element.path() for element in self.elements}
76+
except InvalidConfiguration:
77+
return set()
7378

7479
def cleanup(self) -> None:
7580
pass
@@ -98,7 +103,10 @@ def serialize(self) -> Dict[str, object]:
98103
}
99104

100105
def get_checked_directory_allowlist(self) -> Set[str]:
101-
return {element.path() for element in self.elements}
106+
try:
107+
return {element.path() for element in self.elements}
108+
except InvalidConfiguration:
109+
return set()
102110

103111
def cleanup(self) -> None:
104112
pass

client/configuration/search_path.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,13 @@ def process_raw_elements(
270270
elements: List[Element] = []
271271

272272
def add_if_exists(element: Element) -> bool:
273-
if os.path.exists(element.path()):
274-
elements.append(element)
275-
return True
276-
return False
273+
try:
274+
if os.path.exists(element.path()):
275+
elements.append(element)
276+
return True
277+
return False
278+
except exceptions.InvalidConfiguration:
279+
return False
277280

278281
for raw_element in raw_elements:
279282
expanded_raw_elements = raw_element.expand_glob()

0 commit comments

Comments
 (0)