Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

mount+edit warning message is getting lost if you are booting partiti…

…ons with pygrub (which some people like to do)
  • Loading branch information...
commit e3d2a74fd1a5bc26a35aff6ca0f0fd31d00c385f 1 parent 5b12fea
Tim Freeman timf authored
Showing with 6 additions and 4 deletions.
  1. +6 −4 control/src/python/workspacecontrol/defaults/ImageEditing.py
10 control/src/python/workspacecontrol/defaults/ImageEditing.py
View
@@ -426,10 +426,12 @@ def _doOneMountCopyTask(self, imagepath, src, dst, mntpath, hdimage):
cmd = "%s %s one %s %s %s %s" % (self.sudo_path, self.mounttool_path, imagepath, mntpath, src, dst)
warning = self._doOneMountCopyInnerTask(src, cmd)
if warning:
- offsetint = self._guess_offset(imagepath)
- cmd = "%s %s hdone %s %s %s %s %d" % (self.sudo_path, self.mounttool_path, imagepath, mntpath, src, dst, offsetint)
- error = self._doOneMountCopyInnerTask(src, cmd)
-
+ try:
+ offsetint = self._guess_offset(imagepath)
+ cmd = "%s %s hdone %s %s %s %s %d" % (self.sudo_path, self.mounttool_path, imagepath, mntpath, src, dst, offsetint)
+ error = self._doOneMountCopyInnerTask(src, cmd)
+ except Exception,e:
+ error = e
if not error:
return # if there is a warning, it is discarded
if not warning:
Please sign in to comment.
Something went wrong with that request. Please try again.