Skip to content

Commit

Permalink
[bootloader] Do not parse stderr when checking for the UEFI target ar…
Browse files Browse the repository at this point in the history
…chitecture.

Unrelated errors (like localization ones) may get in and will make the installation
process fail.

Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>
  • Loading branch information
g7 committed Sep 16, 2015
1 parent c56ef9e commit 141a512
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions linstaller/modules/bootloader/inst/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from linstaller.core.libmodules.partdisks.library import check_distributions

import os, sys, fileinput
import commands
import subprocess

## Why are we using the "manual" install method instead of debconf?
## First, we want to keep some sort of compatibility with non-Debian
Expand Down Expand Up @@ -70,7 +70,7 @@ def grub_install(self):
# So we are relying on dpkg-architecture (if Debian system), or fallbacking
# to amd64 if not a Debian system
if os.path.exists("/usr/bin/dpkg-architecture"):
arch = commands.getoutput("/usr/bin/dpkg-architecture -qDEB_BUILD_ARCH")
arch = subprocess.check_output(["/usr/bin/dpkg-architecture", "-qDEB_BUILD_ARCH"]).strip()
else:
arch = "amd64"

Expand Down

0 comments on commit 141a512

Please sign in to comment.