← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/volume/driver.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/volume/driver.py
73
73
                tries = tries + 1
74
74
                if tries >= FLAGS.num_shell_tries:
75
75
                    raise
76
 
                logging.exception("Recovering from a failed execute."
77
 
                                  "Try number %s", tries)
 
76
                logging.exception(_("Recovering from a failed execute."
 
77
                                    "Try number %s"), tries)
78
78
                time.sleep(tries ** 2)
79
79
 
80
80
    def check_for_setup_error(self):
81
81
        """Returns an error if prerequisites aren't met"""
82
82
        if not os.path.isdir("/dev/%s" % FLAGS.volume_group):
83
 
            raise exception.Error("volume group %s doesn't exist"
 
83
            raise exception.Error(_("volume group %s doesn't exist")
84
84
                                  % FLAGS.volume_group)
85
85
 
86
86
    def create_volume(self, volume):
205
205
    @staticmethod
206
206
    def fake_execute(cmd, *_args, **_kwargs):
207
207
        """Execute that simply logs the command."""
208
 
        logging.debug("FAKE AOE: %s", cmd)
 
208
        logging.debug(_("FAKE AOE: %s"), cmd)
209
209
        return (None, None)
210
210
 
211
211
 
310
310
    @staticmethod
311
311
    def fake_execute(cmd, *_args, **_kwargs):
312
312
        """Execute that simply logs the command."""
313
 
        logging.debug("FAKE ISCSI: %s", cmd)
 
313
        logging.debug(_("FAKE ISCSI: %s"), cmd)
314
314
        return (None, None)