Accepting request 829856 from home:mattoliverau:branches:devel:languages:python

- Updated the rbd-support.patch (bsc#1175808):
  * Fixed the signiture of the RBDStorageObject to match changes made
    to parent StorageObject class.

OBS-URL: https://build.opensuse.org/request/show/829856
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rtslib-fb?expand=0&rev=53
This commit is contained in:
Tomáš Chvátal 2020-08-27 06:47:39 +00:00 committed by Git OBS Bridge
parent 040b715555
commit 1edb5164f3
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 27 02:10:59 UTC 2020 - Matthew Oliver <moliver@suse.com>
- Updated the rbd-support.patch (bsc#1175808):
* Fixed the signiture of the RBDStorageObject to match changes made
to parent StorageObject class.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 30 17:49:04 UTC 2020 - lduncan@suse.com Tue Jun 30 17:49:04 UTC 2020 - lduncan@suse.com

View File

@ -36,7 +36,7 @@ Reviewed-by: David Disseldorp <ddiss@suse.de>
+ # RBDStorageObject private stuff + # RBDStorageObject private stuff
+ +
+ def __init__(self, name, dev=None, wwn=None, readonly=False, + def __init__(self, name, dev=None, wwn=None, readonly=False,
+ write_back=False): + write_back=False, index=None):
+ ''' + '''
+ A RBDIOStorageObject can be instantiated in two ways: + A RBDIOStorageObject can be instantiated in two ways:
+ - B{Creation mode}: If I{dev} is specified, the underlying configFS + - B{Creation mode}: If I{dev} is specified, the underlying configFS
@ -62,14 +62,14 @@ Reviewed-by: David Disseldorp <ddiss@suse.de>
+ ''' + '''
+ +
+ if dev is not None: + if dev is not None:
+ super(RBDStorageObject, self).__init__(name, 'create') + super(RBDStorageObject, self).__init__(name, 'create', index)
+ try: + try:
+ self._configure(dev, wwn, readonly) + self._configure(dev, wwn, readonly)
+ except: + except:
+ self.delete() + self.delete()
+ raise + raise
+ else: + else:
+ super(RBDStorageObject, self).__init__(name, 'lookup') + super(RBDStorageObject, self).__init__(name, 'lookup', index)
+ +
+ def _configure(self, dev, wwn, readonly): + def _configure(self, dev, wwn, readonly):
+ self._check_self() + self._check_self()