Skip to content

Commit 08d522b

Browse files
committed
adjust error messages
1 parent fc6ae7e commit 08d522b

File tree

1 file changed

+14
-4
lines changed
  • repos/system_upgrade/common/actors/targetuserspacecreator/libraries

1 file changed

+14
-4
lines changed

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,25 @@ def prepare_target_userspace(context, userspace_dir, enabled_repos, packages):
269269
# failed since leapp does not support updates behind proxy yet.
270270
for manager_info in api.consume(PkgManagerInfo):
271271
if manager_info.configured_proxies:
272-
details['details'] = ("DNF failed to install userspace packages, likely due to the proxy "
273-
"configuration detected in the YUM/DNF configuration file.")
272+
details['details'] = (
273+
"DNF failed to install userspace packages, likely due to the proxy "
274+
"configuration detected in the YUM/DNF configuration file. "
275+
"Make sure the proxy is properly configured in /etc/dnf/dnf.conf. "
276+
"It's also possible the proxy settings in the DNF configuration file are "
277+
"incompatible with the target system. A compatible configuration can be "
278+
"placed in /etc/leapp/files/dnf.conf which, if present, will be used during "
279+
"the upgrade instead of /etc/dnf/dnf.conf. "
280+
"In such case the configuration will also be applied to the target system."
281+
)
274282

275283
# Similarly if a proxy was set specifically for one of the repositories.
276284
for repo_facts in api.consume(RepositoriesFacts):
277285
for repo_file in repo_facts.repositories:
278286
if any(repo_data.proxy and repo_data.enabled for repo_data in repo_file.data):
279-
details['details'] = ("DNF failed to install userspace packages, likely due to the proxy "
280-
"configuration detected in a repository configuration file.")
287+
details['details'] = (
288+
"DNF failed to install userspace packages, likely due to the proxy "
289+
"configuration detected in a repository configuration file."
290+
)
281291

282292
raise StopActorExecutionError(message=message, details=details)
283293

0 commit comments

Comments
 (0)