import python-rtslib-2.1.75-4.el8

This commit is contained in:
CentOS Sources 2022-09-27 16:43:32 -04:00 committed by Stepan Oksanichenko
parent 8557afebe7
commit 483ece4bd4
5 changed files with 32 additions and 19 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/rtslib-fb-2.1.74.tar.gz SOURCES/rtslib-fb-2.1.75.tar.gz

View File

@ -1 +1 @@
298ec36a694f6f27b84ea16a627e349f5c0792f4 SOURCES/rtslib-fb-2.1.74.tar.gz 358077a7fef2e71230a1b5c87b1765c9292f17f6 SOURCES/rtslib-fb-2.1.75.tar.gz

View File

@ -1,15 +1,17 @@
diff --git a/rtslib/fabric.py b/rtslib/fabric.py diff --git a/rtslib/fabric.py b/rtslib/fabric.py
index 02e156c..ff7387f 100644 index eb8f115..c408661 100644
--- a/rtslib/fabric.py --- a/rtslib/fabric.py
+++ b/rtslib/fabric.py +++ b/rtslib/fabric.py
@@ -464,13 +464,13 @@ fabric_modules = { @@ -519,14 +519,14 @@ fabric_modules = {
"srpt": SRPTFabricModule, "srpt": SRPTFabricModule,
"iscsi": ISCSIFabricModule, "iscsi": ISCSIFabricModule,
"loopback": LoopbackFabricModule, "loopback": LoopbackFabricModule,
- "qla2xxx": Qla2xxxFabricModule, - "qla2xxx": Qla2xxxFabricModule,
- "efct": EfctFabricModule,
- "sbp": SBPFabricModule, - "sbp": SBPFabricModule,
- "tcm_fc": FCoEFabricModule, - "tcm_fc": FCoEFabricModule,
+# "qla2xxx": Qla2xxxFabricModule, +# "qla2xxx": Qla2xxxFabricModule,
+# "efct": EfctFabricModule,
+# "sbp": SBPFabricModule, +# "sbp": SBPFabricModule,
+# "tcm_fc": FCoEFabricModule, +# "tcm_fc": FCoEFabricModule,
# "usb_gadget": USBGadgetFabricModule, # very rare, don't show # "usb_gadget": USBGadgetFabricModule, # very rare, don't show

View File

@ -1,22 +1,13 @@
diff --git a/rtslib/root.py b/rtslib/root.py diff --git a/rtslib/root.py b/rtslib/root.py
index 2c5cf43..34bc57d 100644 index ac40752..8e9724b 100644
--- a/rtslib/root.py --- a/rtslib/root.py
+++ b/rtslib/root.py +++ b/rtslib/root.py
@@ -166,21 +166,21 @@ class RTSRoot(CFSNode): @@ -166,19 +166,19 @@ class RTSRoot(CFSNode):
self._dbroot = self._default_dbroot self._dbroot = self._default_dbroot
return return
self._dbroot = fread(dbroot_path) self._dbroot = fread(dbroot_path)
- if self._dbroot != self._preferred_dbroot: - if self._dbroot != self._preferred_dbroot:
+ if self._dbroot != self._default_dbroot: + if self._dbroot != self._default_dbroot:
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
try: try:
- fwrite(dbroot_path, self._preferred_dbroot+"\n") - fwrite(dbroot_path, self._preferred_dbroot+"\n")
+ fwrite(dbroot_path, self._default_dbroot+"\n") + fwrite(dbroot_path, self._default_dbroot+"\n")
@ -26,6 +17,13 @@ index 2c5cf43..34bc57d 100644
raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists." raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists."
- .format(self._preferred_dbroot)) - .format(self._preferred_dbroot))
+ .format(self._default_dbroot)) + .format(self._default_dbroot))
self._dbroot = fread(dbroot_path) else:
# Writing to dbroot_path after devices have been registered will make the kernel emit this error:
# db_root: cannot be changed: target devices registered
from warnings import warn
warn("Cannot set dbroot to {}. Target devices have already been registered."
- .format(self._preferred_dbroot))
+ .format(self._default_dbroot))
return
def _get_dbroot(self): self._dbroot = fread(dbroot_path)

View File

@ -21,8 +21,8 @@ Name: python-rtslib
License: ASL 2.0 License: ASL 2.0
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: API for Linux kernel LIO SCSI target Summary: API for Linux kernel LIO SCSI target
Version: 2.1.74 Version: 2.1.75
Release: 1%{?dist} Release: 4%{?dist}
URL: https://github.com/open-iscsi/%{oname} URL: https://github.com/open-iscsi/%{oname}
Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
Source1: target.service Source1: target.service
@ -191,6 +191,19 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/
%endif # with python2 %endif # with python2
%changelog %changelog
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-4
- Updates to the gating tests from mhoyer
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-3
- Update the gating tests
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-2
- Fix the gating tests
* Mon Jun 06 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-1
- Update to the latest upstream version
* Mon Oct 26 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.74-1 * Mon Oct 26 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.74-1
- Update to the latest upstream version - Update to the latest upstream version