python-rtslib/SOURCES/0002-default_dbroot.patch

32 lines
1.5 KiB
Diff
Raw Normal View History

2020-01-21 21:30:34 +00:00
diff --git a/rtslib/root.py b/rtslib/root.py
2020-07-28 13:47:45 +00:00
index 2c5cf43..34bc57d 100644
2020-01-21 21:30:34 +00:00
--- a/rtslib/root.py
+++ b/rtslib/root.py
2020-07-28 13:47:45 +00:00
@@ -166,21 +166,21 @@ class RTSRoot(CFSNode):
2020-01-21 21:30:34 +00:00
self._dbroot = self._default_dbroot
return
self._dbroot = fread(dbroot_path)
- if self._dbroot != self._preferred_dbroot:
+ if self._dbroot != self._default_dbroot:
2020-07-28 13:47:45 +00:00
if len(FabricModule.list_registered_drivers()) != 0:
# Writing to dbroot_path after drivers have been registered will make the kernel emit this error:
# db_root: cannot be changed: target drivers registered
from warnings import warn
warn("Cannot set dbroot to {}. Target drivers have already been registered."
- .format(self._preferred_dbroot))
+ .format(self._default_dbroot))
return
2020-01-21 21:30:34 +00:00
try:
- fwrite(dbroot_path, self._preferred_dbroot+"\n")
+ fwrite(dbroot_path, self._default_dbroot+"\n")
except:
- if not os.path.isdir(self._preferred_dbroot):
+ if not os.path.isdir(self._default_dbroot):
raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists."
- .format(self._preferred_dbroot))
+ .format(self._default_dbroot))
self._dbroot = fread(dbroot_path)
def _get_dbroot(self):