[Pkg-privacy-commits] [tails-installer] 52/210: Hide the reset MBR hint when it's activated

[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 b913a8848c636b44deb9d6daa8777264d94953c5
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Apr 7 16:39:21 2015 +0200

    Hide the reset MBR hint when it's activated
---
 liveusb/gui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liveusb/gui.py b/liveusb/gui.py
index 7b638d1..67baa71 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -473,7 +473,7 @@ class Release(QObject):
             self.addWarning(_("You are about to perform a destructive install. This will destroy 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():
+        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."))
 

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