Update boom-boot to release 1.2

This commit is contained in:
Marian Csontos 2020-06-07 14:24:09 +02:00
parent 6a671686a3
commit 9dd51d65e3
7 changed files with 7 additions and 75 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/boom-6ff3e08.tar.gz
/boom-1.0.tar.gz
/boom-1.1.tar.gz
/boom-1.2.tar.gz

View File

@ -1,16 +0,0 @@
boom/cache.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boom/cache.py b/boom/cache.py
index 1dc5e07..cf7de47 100644
--- a/boom/cache.py
+++ b/boom/cache.py
@@ -238,7 +238,7 @@ def load_cache(verify=True, digests=False):
images = cachedata["images"]
for image_id in images.keys():
if image_id not in ids:
- _log_warn("Found orphan image_id '%s'" % image)
+ _log_warn("Found orphan image_id '%s'" % image_id)
# clean up?
_log_debug("Loaded %d cache paths and %d images" %

View File

@ -1,16 +0,0 @@
boom/bootloader.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boom/bootloader.py b/boom/bootloader.py
index 3148de2..e0367cb 100644
--- a/boom/bootloader.py
+++ b/boom/bootloader.py
@@ -840,6 +840,8 @@ def load_entries(machine_id=None):
except Exception as e:
_log_info("Could not load BootEntry '%s': %s" %
(entry_path, e))
+ if get_debug_mask():
+ raise e
_log_debug("Loaded %d entries" % len(_entries))

View File

@ -1,16 +0,0 @@
boom/_boom.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boom/_boom.py b/boom/_boom.py
index 0cb65d1..690386e 100644
--- a/boom/_boom.py
+++ b/boom/_boom.py
@@ -1012,6 +1012,8 @@ def load_profiles_for_class(profile_class, profile_type,
except Exception as e:
_log_warn("Failed to load %s from '%s': %s" %
(profile_class.__name__, pf_path, e))
+ if get_debug_mask():
+ raise e
continue

View File

@ -1,16 +0,0 @@
boom/bootloader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boom/bootloader.py b/boom/bootloader.py
index e0367cb..3d8eede 100644
--- a/boom/bootloader.py
+++ b/boom/bootloader.py
@@ -352,7 +352,7 @@ def _grub2_get_env(name):
_log_error("Could not obtain grub2 environment: %s" % e)
return ""
- for line in out.splitlines():
+ for line in out.decode('utf8').splitlines():
(env_name, value) = line.split('=', 1)
if name == env_name:
return value.strip()

View File

@ -2,8 +2,8 @@
%global sphinx_docs 1
Name: boom-boot
Version: 1.1
Release: 4%{?dist}
Version: 1.2
Release: 1%{?dist}
Summary: %{summary}
License: GPLv2
@ -11,10 +11,6 @@ URL: https://github.com/snapshotmanager/boom
Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz
Patch1: 0001-etc-Remove-executable-permission-from-etc-default-bo.patch
Patch2: 0002-man-Fix-line-starting-with.patch
Patch3: 0003-boom.cache-use-correct-variable-in-load_cache-warnin.patch
Patch4: 0004-boom.bootloader-raise-exceptions-in-load_entries-if-.patch
Patch5: 0005-boom-raise-exceptions-in-load_profiles_for_class-if-.patch
Patch6: 0006-boom.bootloader-decode-bytes-output-of-grub2-editenv.patch
BuildArch: noarch
@ -89,10 +85,6 @@ This package provides integration scripts for grub2 bootloader.
# NOTE: Do not use backup extension - MANIFEST.in is picking them
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
%if 0%{?sphinx_docs}
@ -165,6 +157,9 @@ rm doc/conf.py
%changelog
* Sun Jun 07 2020 Marian Csontos <mcsontos@redhat.com> 1.2-1
- Update to bug fix release 1.2.
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1-4
- Rebuilt for Python 3.9

View File

@ -1 +1 @@
SHA512 (boom-1.1.tar.gz) = fdd8894f59be4732bdb2c4471ff13f74c6e635a16587a54b2df718f4ef7e64d9df6618f599d1e5ac9b072883780c7c988ec670d2ae603340ef626005e8a6e1da
SHA512 (boom-1.2.tar.gz) = f59c9a76c58c997ca72b6393ab1169fbd1655736ac6c258f75055d6bcc03335c7ef979fa97b8b5e6aebcf13c78480caa5958856edf543623b6e39e779cae3b82