Skip to content

Commit

Permalink
system-upgrade: Drop warning in upstream
Browse files Browse the repository at this point in the history
The distro package is not available in the minimal installation of related downstreams where the warning should be displayed. Therefore dropping the implementation from the upstream and affected distributions will handle the situation by themselves.

related link: https://bugzilla.redhat.com/show_bug.cgi?id=2152846
  • Loading branch information
jan-kolarik authored and j-mracek committed Jan 2, 2023
1 parent dd673f8 commit 3e0267e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
3 changes: 2 additions & 1 deletion dnf-plugins-core.spec
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,14 @@ Summary: Core Plugins for DNF
%{?python_provide:%python_provide python3-%{name}}
BuildRequires: python3-dbus
BuildRequires: python3-devel
BuildRequires: python3-distro
BuildRequires: python3-dnf >= %{dnf_lowest_compatible}
BuildRequires: python3-systemd
BuildRequires: pkgconfig(systemd)
BuildRequires: systemd
%{?systemd_ordering}
%if 0%{?fedora}
Requires: python3-distro
%endif
Requires: python3-dbus
Requires: python3-dnf >= %{dnf_lowest_compatible}
Requires: python3-hawkey >= %{hawkey_version}
Expand Down
2 changes: 0 additions & 2 deletions doc/system-upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ is fully upgraded (``dnf --refresh upgrade``).
The ``system-upgrade`` command also performes additional actions necessary for the upgrade of the
system, for example an upgrade of groups and environments.

.. WARNING:: The ``system-upgrade`` command is not supported on the RHEL distribution.

--------
Synopsis
--------
Expand Down
4 changes: 0 additions & 4 deletions plugins/system_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"""system_upgrade.py - DNF plugin to handle major-version system upgrades."""

from subprocess import call, Popen, check_output, CalledProcessError
import distro
import json
import os
import os.path
Expand Down Expand Up @@ -460,9 +459,6 @@ def pre_configure_clean(self):

def configure_download(self):
if 'system-upgrade' == self.opts.command or 'fedup' == self.opts.command:
if distro.id() == 'rhel':
logger.warning(_('WARNING: this operation is not supported on the RHEL distribution. '
'Proceed at your own risk.'))
help_url = get_url_from_os_release()
if help_url:
msg = _('Additional information for System Upgrade: {}')
Expand Down

0 comments on commit 3e0267e

Please sign in to comment.