[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3621] trunk/py/scripts/addons/ render_renderfarmfi: Improve message on login failure for non-existing user .
Nathan Letwory
nathan at letworyinteractive.com
Fri Jul 13 09:29:52 CEST 2012
Revision: 3621
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3621
Author: jesterking
Date: 2012-07-13 07:29:51 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Improve message on login failure for non-existing user.
Modified Paths:
--------------
trunk/py/scripts/addons/render_renderfarmfi/operators.py
trunk/py/scripts/addons/render_renderfarmfi/rpc.py
Modified: trunk/py/scripts/addons/render_renderfarmfi/operators.py
===================================================================
--- trunk/py/scripts/addons/render_renderfarmfi/operators.py 2012-07-13 06:33:01 UTC (rev 3620)
+++ trunk/py/scripts/addons/render_renderfarmfi/operators.py 2012-07-13 07:29:51 UTC (rev 3621)
@@ -206,14 +206,13 @@
ore.password = ore.password.strip()
ore.username = ore.username.strip()
- if ore.password != '' and ore.username != '':
- print("writing new credentials")
- _write_credentials(hashlib.md5(ore.password.encode() + ore.username.encode()).hexdigest(),ore.username)
- _read_credentials()
- ore.password = ''
- ore.username = ''
- bpy.loginInserted = False
- bpy.passwordCorrect = False
+ print("writing new credentials")
+ _write_credentials(hashlib.md5(ore.password.encode() + ore.username.encode()).hexdigest(),ore.username)
+ _read_credentials()
+ ore.password = ''
+ ore.username = ''
+ bpy.loginInserted = False
+ bpy.passwordCorrect = False
try:
_do_refresh(self, True)
Modified: trunk/py/scripts/addons/render_renderfarmfi/rpc.py
===================================================================
--- trunk/py/scripts/addons/render_renderfarmfi/rpc.py 2012-07-13 06:33:01 UTC (rev 3620)
+++ trunk/py/scripts/addons/render_renderfarmfi/rpc.py 2012-07-13 07:29:51 UTC (rev 3621)
@@ -129,7 +129,7 @@
return 0
except LoginFailedException as lfe:
- print("_do_refresh login failed", lfe)
+ if print_errors: print("_do_refresh login failed", lfe)
if rethrow:
raise lfe
return 1
@@ -145,12 +145,22 @@
def login(self, op, rethrow=False, print_errors=True):
self.res = None
+
+ if bpy.rffi_user=='':
+ raise LoginFailedException("No email address given")
+
+ if bpy.rffi_hash=='':
+ raise LoginFailedException("No password given")
+
try:
self.res = self.sproxy.auth.getSessionKey(bpy.rffi_user, bpy.rffi_hash)
except xmlrpc.client.Error as v:
if op: op.report({'WARNING'}, "Error at login : " + str(type(v)) + " -> " + str(v.faultCode) + ": " + v.faultString)
if print_errors: print("Error at login: ",v)
if rethrow:
+ vstr = str(v)
+ if "Failed to invoke method getSessionKey" in vstr:
+ raise LoginFailedException('User '+bpy.rffi_user+' doesn\'t exist')
raise LoginFailedException(v.faultString)
return None
except Exception as v:
More information about the Bf-extensions-cvs
mailing list