[Pkg-privacy-commits] [tails-installer] 63/210: Display the MBR warnings only when dd is not used

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit 118811f385956cd60809869f6bab80a6f72464a6
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Apr 9 12:16:02 2015 +0200

    Display the MBR warnings only when dd is not used
---
 liveusb/gui.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/liveusb/gui.py b/liveusb/gui.py
index 24ce750..a42cb4b 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -478,11 +478,12 @@ class Release(QObject):
         self.info = []
         if self.parent().option('dd'):
             self.addWarning(_("You are about to perform a destructive install. This will erase all data and partitions on your USB drive"))
-        if self.live.blank_mbr():
-            self.addInfo(_("The Master Boot Record on your device is blank. Writing the image will reset the MBR on this device"))
-        elif not self.live.mbr_matches_syslinux_bin() and not self.parent().option('resetMBR'):
-            self.addInfo(_("The Master Boot Record on your device does not match your system's syslinux MBR.\n"
-                          "If you have trouble booting it, try setting the \"Reset the MBR\" advanced option."))
+        else:
+            if self.live.blank_mbr():
+                self.addInfo(_("The Master Boot Record on your device is blank. Writing the image will reset the MBR on this device"))
+            elif not self.live.mbr_matches_syslinux_bin() and not self.parent().option('resetMBR'):
+                self.addInfo(_("The Master Boot Record on your device does not match your system's syslinux MBR.\n"
+                              "If you have trouble booting it, try setting the \"Reset the MBR\" advanced option."))
 
         try:
             self.live.mount_device()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git