From 2415787040914e165fc4713d456ae3361fc68735 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 30 Apr 2013 13:03:14 -0400 Subject: [PATCH] gummiboot: Fix bug where old conf scripts for single-digit generations weren't removed Signed-off-by: Shea Levy --- .../system/boot/loader/gummiboot/gummiboot-builder.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py index b8e9e983e79..9ea224b51f6 100644 --- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py +++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py @@ -72,10 +72,13 @@ def get_generations(profile): def remove_old_entries(gens): slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-") slice_end = -1 * len(".conf") - for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9][0-9]*.conf"): - gen = int(path[slice_start:slice_end]) - if not gen in gens: - os.unlink(path) + for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"): + try: + gen = int(path[slice_start:slice_end]) + if not gen in gens: + os.unlink(path) + except ValueError: + pass for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"): if not path in known_paths: os.unlink(path)