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.

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

[build] Drop legacy redirectors #3915

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

TurboTurtle
Copy link
Member

Following on from earlier work that added a deprecation message to the sosreport and sos-collector redirectors about the commands being dropped in sos-4.9, drop the redirectors and their manpage symlinks so that only sos is available as an entry point.

Closes: #3374


Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines

  • Is the commit message split over multiple lines and hard-wrapped at 72 characters?
  • Is the subject and message clear and concise?
  • Does the subject start with [plugin_name] if submitting a plugin patch or a [section_name] if part of the core sosreport code?
  • Does the commit contain a Signed-off-by: First Lastname email@example.com?
  • Are any related Issues or existing PRs properly referenced via a Closes (Issue) or Resolved (PR) line?
  • Are all passwords or private data gathered by this PR obfuscated?

@arif-ali
Copy link
Member

It's probably worth making the following change too

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1c796aa3..ab865f34 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -41,7 +41,3 @@ parts:
 apps:
   sos:
     command: bin/sos
-  sosreport:
-    command: bin/sos report
-  sos-collector:
-    command: bin/sos collector

Also, setup.py needs updating, maaybe

diff --git a/setup.py b/setup.py
index 9ad4bb75..4295b6b9 100644
--- a/setup.py
+++ b/setup.py
@@ -19,11 +19,10 @@ setup(
     maintainer_email='jhunsake@redhat.com',
     url='https://github.com/sosreport/sos',
     license="GPLv2+",
-    scripts=['bin/sos', 'bin/sosreport', 'bin/sos-collector'],
+    scripts=['bin/sos'],
     data_files=[
-        ('share/man/man1', ['man/en/sosreport.1', 'man/en/sos-report.1',
+        ('share/man/man1', ['man/en/sos-report.1', 'man/en/sos-clean.1',
                             'man/en/sos.1', 'man/en/sos-collect.1',
-                            'man/en/sos-collector.1', 'man/en/sos-clean.1',
                             'man/en/sos-mask.1', 'man/en/sos-help.1']),
         ('share/man/man5', ['man/en/sos.conf.5']),
         ('share/licenses/sos', ['LICENSE']),

@arif-ali arif-ali added Status/Need More Info Feedback is required to reproduce issue or to continue work Status/Needs Review This issue still needs a review from project members labels Jan 30, 2025
Following on from earlier work that added a deprecation message to the
`sosreport` and `sos-collector` redirectors about the commands being
dropped in sos-4.9, drop the redirectors and their manpage symlinks so
that only `sos` is available as an entry point.

Closes: sosreport#3374

Signed-off-by: Jake Hunsaker <jacob.r.hunsaker@gmail.com>
Copy link

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-3915
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

1 similar comment
Copy link

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-3915
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status/Need More Info Feedback is required to reproduce issue or to continue work Status/Needs Review This issue still needs a review from project members
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feedback requested] Dropping redirectors and updating text output for sosreport
2 participants