core (params): return given profile for ProfileUnknownError
This commit is contained in:
parent
04a42fa9a3
commit
d7bca38b31
1 changed files with 6 additions and 6 deletions
|
|
@ -190,7 +190,7 @@ class Params(object):
|
||||||
"""
|
"""
|
||||||
if not self.storage.hasProfile(profile):
|
if not self.storage.hasProfile(profile):
|
||||||
log.info(_('Trying to delete an unknown profile'))
|
log.info(_('Trying to delete an unknown profile'))
|
||||||
return defer.fail(Failure(exceptions.ProfileUnknownError))
|
return defer.fail(Failure(exceptions.ProfileUnknownError(profile)))
|
||||||
if self.host.isConnected(profile):
|
if self.host.isConnected(profile):
|
||||||
if force:
|
if force:
|
||||||
self.host.disconnect(profile)
|
self.host.disconnect(profile)
|
||||||
|
|
@ -218,7 +218,7 @@ class Params(object):
|
||||||
default = self.host.memory.memory_data['Profile_default'] = self.storage.getProfilesList()[0]
|
default = self.host.memory.memory_data['Profile_default'] = self.storage.getProfilesList()[0]
|
||||||
except IndexError:
|
except IndexError:
|
||||||
log.info(_('No profile exist yet'))
|
log.info(_('No profile exist yet'))
|
||||||
raise exceptions.ProfileUnknownError
|
raise exceptions.ProfileUnknownError(profile_key)
|
||||||
return default # FIXME: temporary, must use real default value, and fallback to first one if it doesn't exists
|
return default # FIXME: temporary, must use real default value, and fallback to first one if it doesn't exists
|
||||||
elif profile_key == C.PROF_KEY_NONE:
|
elif profile_key == C.PROF_KEY_NONE:
|
||||||
raise exceptions.ProfileNotSetError
|
raise exceptions.ProfileNotSetError
|
||||||
|
|
@ -226,7 +226,7 @@ class Params(object):
|
||||||
return profile_key # this value must be managed by the caller
|
return profile_key # this value must be managed by the caller
|
||||||
if not self.storage.hasProfile(profile_key):
|
if not self.storage.hasProfile(profile_key):
|
||||||
log.error(_(u'Trying to access an unknown profile (%s)') % profile_key)
|
log.error(_(u'Trying to access an unknown profile (%s)') % profile_key)
|
||||||
raise exceptions.ProfileUnknownError
|
raise exceptions.ProfileUnknownError(profile_key)
|
||||||
return profile_key
|
return profile_key
|
||||||
|
|
||||||
def __get_unique_node(self, parent, tag, name):
|
def __get_unique_node(self, parent, tag, name):
|
||||||
|
|
@ -435,7 +435,7 @@ class Params(object):
|
||||||
if ((param_cat, param_name) == C.PROFILE_PASS_PATH) or not value:
|
if ((param_cat, param_name) == C.PROFILE_PASS_PATH) or not value:
|
||||||
return defer.succeed(value) # profile password and empty passwords are returned "as is"
|
return defer.succeed(value) # profile password and empty passwords are returned "as is"
|
||||||
if not profile:
|
if not profile:
|
||||||
raise exceptions.ProfileUnknownError('The profile is needed to decrypt a password')
|
raise exceptions.ProfileNotSetError('The profile is needed to decrypt a password')
|
||||||
d = self.host.memory.decryptValue(value, profile)
|
d = self.host.memory.decryptValue(value, profile)
|
||||||
|
|
||||||
def gotPlainPassword(password):
|
def gotPlainPassword(password):
|
||||||
|
|
@ -491,7 +491,7 @@ class Params(object):
|
||||||
profile = self.getProfileName(profile_key)
|
profile = self.getProfileName(profile_key)
|
||||||
if not profile:
|
if not profile:
|
||||||
log.error(_('Requesting a param for an non-existant profile'))
|
log.error(_('Requesting a param for an non-existant profile'))
|
||||||
raise exceptions.ProfileUnknownError
|
raise exceptions.ProfileUnknownError(profile_key)
|
||||||
|
|
||||||
if profile not in self.params:
|
if profile not in self.params:
|
||||||
log.error(_('Requesting synchronous param for not connected profile'))
|
log.error(_('Requesting synchronous param for not connected profile'))
|
||||||
|
|
@ -814,7 +814,7 @@ class Params(object):
|
||||||
profile = self.getProfileName(profile_key)
|
profile = self.getProfileName(profile_key)
|
||||||
if not profile:
|
if not profile:
|
||||||
log.error(_(u'Trying to set parameter for an unknown profile'))
|
log.error(_(u'Trying to set parameter for an unknown profile'))
|
||||||
raise exceptions.ProfileUnknownError
|
raise exceptions.ProfileUnknownError(profile_key)
|
||||||
|
|
||||||
node = self._getParamNode(name, category, '@ALL@')
|
node = self._getParamNode(name, category, '@ALL@')
|
||||||
if not node:
|
if not node:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue