Skip to content

Commit e6776c8

Browse files
committed
fixup! dnfplugin.py: Update err msgs and handle transaction issues better
1 parent dcd2127 commit e6776c8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

repos/system_upgrade/common/libraries/dnfplugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def _handle_transaction_err_msg(stage, xfs_info, err, is_container=False):
173173
# ignore the fallback when the error is related to the container issue
174174
# e.g. installation of packages inside the container; so it's unrelated
175175
# to the upgrade transactions.
176-
if get_env('LEAPP_OVL_LEGACY', '0') != '1' and not is_container:
176+
if get_env('LEAPP_OVL_LEGACY', '0') == '1' and not is_container:
177177
_handle_transaction_err_msg_old(stage, xfs_info, err)
178178
return # not needed actually as the above function raises error, but for visibility
179179
NO_SPACE_STR = 'more space needed on the'
@@ -212,7 +212,7 @@ def _handle_transaction_err_msg(stage, xfs_info, err, is_container=False):
212212
' provide reasonably more free space (e.g. when 200 MB is missing'
213213
' on /usr, add 1200MB or more).'
214214
)
215-
details = {'hint': hint, 'Disk Requirements': missing_space}
215+
details = {'hint': hint, 'Disk Requirements': '\n'.join(missing_space)}
216216

217217
raise StopActorExecutionError(message=message, details=details)
218218

0 commit comments

Comments
 (0)