← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/api/ec2/__init__.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/__init__.py
77
77
                    req.host,
78
78
                    req.path)
79
79
        except exception.Error, ex:
80
 
            logging.debug("Authentication Failure: %s" % ex)
 
80
            logging.debug(_("Authentication Failure: %s") % ex)
81
81
            raise webob.exc.HTTPForbidden()
82
82
 
83
83
        # Authenticated!
120
120
        except:
121
121
            raise webob.exc.HTTPBadRequest()
122
122
 
123
 
        _log.debug('action: %s' % action)
 
123
        _log.debug(_('action: %s') % action)
124
124
        for key, value in args.items():
125
 
            _log.debug('arg: %s\t\tval: %s' % (key, value))
 
125
            _log.debug(_('arg: %s\t\tval: %s') % (key, value))
126
126
 
127
127
        # Success!
128
128
        req.environ['ec2.controller'] = controller