-
-
Notifications
You must be signed in to change notification settings - Fork 9
/
LOCAL_SALTSTACK_SOURCE_MODS_SALT-PRIME
29 lines (26 loc) · 1.19 KB
/
LOCAL_SALTSTACK_SOURCE_MODS_SALT-PRIME
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- /usr/lib/python3/dist-packages/salt/modules/boto_rds.py.BAK 2021-10-12 15:43:35.000000000 +0000
+++ /usr/lib/python3/dist-packages/salt/modules/boto_rds.py 2022-01-31 21:16:58.909617998 +0000
@@ -219,7 +219,8 @@
rds = conn.describe_db_subnet_groups(DBSubnetGroupName=name)
return {"exists": bool(rds)}
except ClientError as e:
- if "DBSubnetGroupNotFoundFault" in e.message:
+ # https://github.com/saltstack/salt/issues/61555
+ if "DBSubnetGroupNotFoundFault" in str(e):
return {"exists": False}
else:
return {"error": __utils__["boto3.get_error"](e)}
--- /opt/saltstack/salt/lib/python3.10/site-packages/salt/loader/context.py.BAK 2023-12-12 17:52:33.000000000 +0000
+++ /opt/saltstack/salt/lib/python3.10/site-packages/salt/loader/context.py 2024-01-19 16:11:57.578425498 +0000
@@ -84,7 +84,12 @@
self.value()[item] = value
def __bool__(self):
- return bool(self.value())
+ # https://github.com/saltstack/salt/issues/65691
+ try:
+ self.loader
+ except LookupError:
+ return False
+ return True
def __len__(self):
return self.value().__len__()