server/serverctl.py
branchstable
changeset 6109 47d9c0e0f7b7
parent 6072 9d83b214066a
child 6127 747e423093fc
--- a/server/serverctl.py	Fri Aug 13 13:34:47 2010 +0200
+++ b/server/serverctl.py	Fri Aug 13 08:23:14 2010 +0200
@@ -457,7 +457,7 @@
             cnx.rollback()
             import traceback
             traceback.print_exc()
-            print '-> an error occured:', ex
+            print '-> an error occurred:', ex
         else:
             cnx.commit()
             print '-> rights granted to %s on instance %s.' % (appid, user)
@@ -509,7 +509,7 @@
             cnx.rollback()
             import traceback
             traceback.print_exc()
-            print '-> an error occured:', ex
+            print '-> an error occurred:', ex
         else:
             cnx.commit()
             print '-> password reset, sources file regenerated.'
@@ -595,7 +595,7 @@
     rmcmd = 'ssh -t %s "rm -f /tmp/%s"' % (host, filename)
     print rmcmd
     if os.system(rmcmd) and not ASK.confirm(
-        'An error occured while deleting remote dump at /tmp/%s. '
+        'An error occurred while deleting remote dump at /tmp/%s. '
         'Continue anyway?' % filename):
         raise ExecutionError('Error while deleting remote dump at /tmp/%s' % filename)