Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/boottool.py

 # Copyright 2009 Google Inc. Released under the GPL v2
 
 import re
 
 
 class boottool(object):
     """
     Common class for the client and server side boottool wrappers.
     """
 
@@ skipping 246 matching lines @@
         """
         Removes a specific entry from the bootloader configuration.
 
         @param kernel: can be 'start', 'end', entry position or entry title.
         """
         self._run_boottool('--remove-kernel=%s' % kernel)
 
 
     def boot_once(self, title=None):
         """
-        Sets a specific entry for the next boot  Then falls back to the
+        Sets a specific entry for the next boot, then falls back to the
         default kernel.
 
         @param kernel: title that identifies the entry to set for booting. If
-                evaluates to false it will use the default entry title.
-                (FIXME: that does not make much sense, if an entry is default
-                by definition that means it boots next anyways so maybe it
-                should be a NOP for title evaluating to False)
+                evaluates to false, this becomes a no-op.
         """
-        if not title:
-            title = self.get_default_title()
-        self._run_boottool('--boot-once', '--title=%s' % title)
+        if title:
+            self._run_boottool('--boot-once', '--title=%s' % title)
 
 
     def enable_xen_mode(self):
         """
         Enables xen mode. Future operations will assume xen is being used.
         """
         self._xen_mode = True
 
 
     def disable_xen_mode(self):
         """
         Disables xen mode.
         """
         self._xen_mode = False
 
 
     def get_xen_mode(self):
         """
         Returns a boolean with the current status of xen mode.
         """
         return self._xen_mode