Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #36938 - Ignore output of some commands in Global Registration #9914

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Fixes #36938 - Ignore output of some commands in Global Registration #9914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/unattended/provisioning_templates/registration/global_registration.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ if [ -x "$(command -v subscription-manager)" ] ; then
subscription-manager clean
fi

$PKG_MANAGER_REMOVE katello-ca-consumer\*
$PKG_MANAGER_REMOVE katello-ca-consumer\* > /dev/null 2>&1
<% end -%>

# Prepare SSL certificate
Expand All @@ -175,7 +175,7 @@ chmod 644 $KATELLO_SERVER_CA_CERT
if ! [ -x "$(command -v subscription-manager)" ] ; then
$PKG_MANAGER_INSTALL subscription-manager
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you need to silence this command too?

There are also subscription-manager config commands later in this script, do you know if they need to be silenced too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reproduced the reported issue and tested it with the changes in this PR. For me, the current modifications cleared all the unnecessary messages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$PKG_MANAGER_INSTALL subscription-manager this one no, because if installation of subman fails, users need to know about it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, on a second thought if sub-man is not installed on the system, package manager should not complain about subscriptions, since the plugin that does that, would not be installed at all.

else
$PKG_MANAGER_UPGRADE subscription-manager
$PKG_MANAGER_UPGRADE subscription-manager > /dev/null 2>&1
fi

if ! [ -f $RHSM_CFG ] ; then
Expand Down