forked from rpms/leapp-repository
c64266d19b
- Introduce new upgrade path RHEL 8.9 -> 9.3 - Update leapp data files to reflect new changes between systems - Detect and report use of deprecated Xorg drivers - Minor improvements of generated reports - Fix false positive report about invalid symlinks - Inhibit the upgrade when unsupported x86-64 microarchitecture is detected - Resolves: rhbz#2215997
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From dd501739e40837d721dbe2a43a412402555ef46c Mon Sep 17 00:00:00 2001
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
|
Date: Tue, 14 Mar 2023 12:03:35 +0100
|
|
Subject: [PATCH 09/30] Fix trace with impossible LEAPP_DEVEL_TARGET_RELEASE
|
|
|
|
With this change the (pre)upgrade will correctly handle
|
|
impossible target release version, no more ugly trace will
|
|
be shown.
|
|
|
|
OAMG-8651
|
|
---
|
|
commands/upgrade/breadcrumbs.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/commands/upgrade/breadcrumbs.py b/commands/upgrade/breadcrumbs.py
|
|
index bfb91148..61660fb1 100644
|
|
--- a/commands/upgrade/breadcrumbs.py
|
|
+++ b/commands/upgrade/breadcrumbs.py
|
|
@@ -127,6 +127,10 @@ class _BreadCrumbs(object):
|
|
return []
|
|
|
|
def _verify_leapp_pkgs(self):
|
|
+ if not os.environ.get('LEAPP_IPU_IN_PROGRESS'):
|
|
+ # NOTE(ivasilev) this can happen if LEAPP_DEVEL_TARGET_RELEASE is specified and pointing to an impossible
|
|
+ # version
|
|
+ return []
|
|
upg_path = os.environ.get('LEAPP_IPU_IN_PROGRESS').split('to')
|
|
cmd = ['/bin/bash', '-c', 'rpm -V leapp leapp-upgrade-el{}toel{}'.format(upg_path[0], upg_path[1])]
|
|
res = _call(cmd, lambda x, y: None, lambda x, y: None)
|
|
--
|
|
2.40.1
|
|
|