Accepting request 595001 from home:lee_duncan:branches:devel:languages:python

- Update to version 2.1.fb67:
  * Add missing dependency on six in setup.py
  * Display a more meaningful error when targetcli cannot change "dbroot"
  * Raise an error about failing to change the dbroot value only if the directory does not exist
  * More compatibility syntax for legacy distros
  * Remove hba-only directories in clear_existing()
  * Correct name for Xen pvscsi
  * version 2.1.fb65
  * Fix unqualified reference to pyudev.Device
  * version 2.1.fb66
  * create: remove stale hba-only dir
  * version 2.1.fb67
- This replaced rtslib-fb-2.1.fb64.tar.xz with
  rtslib-fb-2.1.fb67.tar.xz, and it also removed
  the patch correct-name-for-xen-pvscsi.patch,
  since it is already in the updated tarball

OBS-URL: https://build.opensuse.org/request/show/595001
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rtslib-fb?expand=0&rev=33
This commit is contained in:
Lee Duncan 2018-04-09 22:42:50 +00:00 committed by Git OBS Bridge
parent 4e5d2875ce
commit 4542f882f7
7 changed files with 28 additions and 49 deletions

View File

@ -4,8 +4,8 @@
<param name="url">https://github.com/open-iscsi/rtslib-fb.git</param> <param name="url">https://github.com/open-iscsi/rtslib-fb.git</param>
<param name="subdir"></param> <param name="subdir"></param>
<param name="filename">rtslib-fb</param> <param name="filename">rtslib-fb</param>
<param name="versionformat">2.1.fb64</param> <param name="versionformat">2.1.fb67</param>
<param name="revision">v2.1.fb64</param> <param name="revision">v2.1.fb67</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/open-iscsi/rtslib-fb.git</param> <param name="url">https://github.com/open-iscsi/rtslib-fb.git</param>
<param name="changesrevision">737496e24ede21effc807a553cebe88ed5660a2b</param></service></servicedata> <param name="changesrevision">a46e6bf9ea0f83acdff1761a11c502ea5863945f</param></service></servicedata>

View File

@ -1,39 +0,0 @@
From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 17 Jan 2018 12:27:48 +0100
Subject: Correct name for Xen pvscsi
Git-commit: 5a5670608b7abab061a59d65568e8ab0a53b6ef0
References: bsc#1076455
The name used in released products is xen-pvscsi, not xen_pvscsi.
Fixes: 2bcc4cd ("Add support for xen-scsiback")
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Lee Duncan <lduncan@suse.com>
---
rtslib/fabric.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rtslib/fabric.py b/rtslib/fabric.py
index 4e9a1ee4073a..b529f14815cc 100644
--- a/rtslib/fabric.py
+++ b/rtslib/fabric.py
@@ -440,7 +440,7 @@ class VhostFabricModule(_BaseFabricModule):
class XenPvScsiFabricModule(_BaseFabricModule):
def __init__(self):
- super(XenPvScsiFabricModule, self).__init__('xen_pvscsi')
+ super(XenPvScsiFabricModule, self).__init__('xen-pvscsi')
self._path = "%s/%s" % (self.configfs_dir, 'xen-pvscsi')
self.features = ("nexus", "tpgts")
self.wwn_types = ('naa',)
@@ -469,7 +469,7 @@ fabric_modules = {
"tcm_fc": FCoEFabricModule,
# "usb_gadget": USBGadgetFabricModule, # very rare, don't show
"vhost": VhostFabricModule,
- "xen_pvscsi": XenPvScsiFabricModule,
+ "xen-pvscsi": XenPvScsiFabricModule,
"ibmvscsis": IbmvscsisFabricModule,
}

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Apr 09 21:41:01 UTC 2018 - lduncan@suse.com
- Update to version 2.1.fb67:
* Add missing dependency on six in setup.py
* Display a more meaningful error when targetcli cannot change "dbroot"
* Raise an error about failing to change the dbroot value only if the directory does not exist
* More compatibility syntax for legacy distros
* Remove hba-only directories in clear_existing()
* Correct name for Xen pvscsi
* version 2.1.fb65
* Fix unqualified reference to pyudev.Device
* version 2.1.fb66
* create: remove stale hba-only dir
* version 2.1.fb67
- This replaced rtslib-fb-2.1.fb64.tar.xz with
rtslib-fb-2.1.fb67.tar.xz, and it also removed
the patch correct-name-for-xen-pvscsi.patch,
since it is already in the updated tarball
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 25 08:09:45 UTC 2018 - olaf@aepfle.de Sun Feb 25 08:09:45 UTC 2018 - olaf@aepfle.de

View File

@ -17,18 +17,17 @@
%define oname rtslib-fb %define oname rtslib-fb
%define realver 2.1.fb64 %define realver 2.1.fb67
%define dbdir %{_sysconfdir}/target %define dbdir %{_sysconfdir}/target
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-%{oname} Name: python-%{oname}
Version: 2.1.64 Version: 2.1.67
Release: 0%{?dist} Release: 0%{?dist}
Summary: API for Linux kernel SCSI target (aka LIO) Summary: API for Linux kernel SCSI target (aka LIO)
License: Apache-2.0 License: Apache-2.0
Group: Development/Languages/Python Group: Development/Languages/Python
Url: http://github.com/open-iscsi/rtslib-fb.git Url: http://github.com/open-iscsi/rtslib-fb.git
Source: %{oname}-%{realver}.tar.xz Source: %{oname}-%{realver}.tar.xz
Patch1: correct-name-for-xen-pvscsi.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyudev} BuildRequires: %{python_module pyudev}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
@ -50,7 +49,6 @@ the Apache 2.0 license. Contributions are welcome
%prep %prep
%setup -q -n %{oname}-%{realver} %setup -q -n %{oname}-%{realver}
%patch1 -p1
%build %build
%python_build %python_build

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33d12557f0089f684953f6ee5cdcdd2d476335be4ce508620b0b5f829a6b17c
size 39900

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f7a668677dd8ac266090626184af1e90709b5d3988933b2015771636f157324
size 39944