From 2b40966081ed5920d4e56971f530f565fc5efd11 Mon Sep 17 00:00:00 2001 From: Shinji Suzuki Date: Thu, 26 Jul 2018 08:14:58 +0900 Subject: [PATCH] Defer check for SuperGrubDisk so that more specific distro checks take precedence. Improved a comment. --- scripts/distro.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/distro.py b/scripts/distro.py index c6bc7ea..1166255 100644 --- a/scripts/distro.py +++ b/scripts/distro.py @@ -81,7 +81,6 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False): # Sorry you can't include | in a keyword for now. test_vector = [ ('ubcd', contains('ubcd')), - ('sgrubd2', contains('Super Grub Disk')), ('hbcd', contains('hbcd')), ('systemrescuecd', contains('systemrescuecd')), ('parted-magic', [contains('pmagic|partedmagic'), @@ -144,11 +143,12 @@ def distro(iso_cfg_ext_dir, iso_link, expose_exception=False): ('rising-av', contains('BOOT_IMAGE=rising')), ('Avira-RS', contains('Avira Rescue System')), ('insert', contains('BOOT_IMAGE=insert')), + ('sgrubd2', contains('Super Grub Disk')), ] - # I'm not sure if this check is necessary prvious but code had skipped - # keyword based checks if the platform is unknown. + # I'm not sure if this platform check is necessary but I will + # avoid removal to not alter the behaviour. if platform.system() == "Linux" or platform.system() == "Windows": for path, subdirs, files in os.walk(iso_cfg_ext_dir): for name in files: