From d9187c25c741be28e06af3fdf19dfd7f3e7cb580 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Wed, 12 Nov 2014 18:54:26 +0100 Subject: [PATCH] check_chroot_call does not actually return a error code, use chroot_call instead. Thanks to Kevin Kofler for pointing this out. --- src/modules/dracut/main.py | 8 +++----- src/modules/initramfs/main.py | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/modules/dracut/main.py b/src/modules/dracut/main.py index 7fc59baf3..ec5eccd60 100644 --- a/src/modules/dracut/main.py +++ b/src/modules/dracut/main.py @@ -19,14 +19,12 @@ # along with Calamares. If not, see . import libcalamares -from libcalamares.utils import check_chroot_call +from libcalamares.utils import chroot_call def run_dracut(): - return check_chroot_call(['dracut', '-f']) + return chroot_call(['dracut', '-f']) def run(): returnCode = run_dracut() if returnCode != 0: - return ("Failed to run dracut on the target", "The exit code was {}".format(returnCode)) - - + return ("Failed to run dracut on the target", "The exit code was {}".format(returnCode)) \ No newline at end of file diff --git a/src/modules/initramfs/main.py b/src/modules/initramfs/main.py index 058bf2e30..215997d8d 100644 --- a/src/modules/initramfs/main.py +++ b/src/modules/initramfs/main.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . -from libcalamares.utils import check_chroot_call +from libcalamares.utils import chroot_call def run(): - returnCode = check_chroot_call(["update-initramfs", "-k", "all", "-u"]) + returnCode = chroot_call(["update-initramfs", "-k", "all", "-u"]) if returnCode != 0: return ("Failed to run update-initramfs on the target", "The exit code was {}".format(returnCode))