|
@@ -2235,8 +2235,8 @@ class Registry(OpenShiftCLI):
|
|
|
''' prepared_registry property '''
|
|
|
if not self.__prepared_registry:
|
|
|
results = self.prepare_registry()
|
|
|
- if not results:
|
|
|
- raise RegistryException('Could not perform registry preparation.')
|
|
|
+ if not results or ('returncode' in results and results['returncode'] != 0):
|
|
|
+ raise RegistryException('Could not perform registry preparation. {}'.format(results))
|
|
|
self.__prepared_registry = results
|
|
|
|
|
|
return self.__prepared_registry
|
|
@@ -2301,8 +2301,8 @@ class Registry(OpenShiftCLI):
|
|
|
# probably need to parse this
|
|
|
# pylint thinks results is a string
|
|
|
# pylint: disable=no-member
|
|
|
- if results['returncode'] != 0 and 'items' in results['results']:
|
|
|
- return results
|
|
|
+ if results['returncode'] != 0 and 'items' not in results['results']:
|
|
|
+ raise RegistryException('Could not perform registry preparation. {}'.format(results))
|
|
|
|
|
|
service = None
|
|
|
deploymentconfig = None
|