aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2020-03-27 10:48:50 -0400
committerJake Hunsaker <jhunsake@redhat.com>2020-04-08 09:27:16 -0400
commit2b58a44efbe87623cb1fa0f2453d7f9e89b1840c (patch)
tree05be12d99ca8c194f5317976f371ff7900a621cf /bin
parentd8fd798c776e785c6a43a727df19c786e019cc52 (diff)
downloadsos-2b58a44efbe87623cb1fa0f2453d7f9e89b1840c.tar.gz
[binary] Have legacy sosreport binary redirect to sos
We need to carry a `sosreport` binary for some time to allow for end users and downstreams to adjust to the new binary. It was hoped originally that the old `sosreport` binary could be maintained in place and simply provide the older set of functionality. This has proven to not be possible givent he overhaul of the options handling that allows us to have multiple subcommands. So while we will still ship an `sosreport` binary, and it will be locked to `report` functionality, it is now a simple redirection script that also makes the user aware of the new `sos` binary. Closes: #1986 Resolves: #1993 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/sosreport18
1 files changed, 14 insertions, 4 deletions
diff --git a/bin/sosreport b/bin/sosreport
index 3c2b5e03..a298d636 100755
--- a/bin/sosreport
+++ b/bin/sosreport
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# This file is part of the sos project: https://github.com/sosreport/sos
#
# This copyrighted material is made available to anyone wishing to use,
@@ -11,15 +11,25 @@
import sys
import os
+import time
+
try:
# allow running from the git checkout, even though as of 4.0 we are moving
# binaries into a bin/ top-level directory.
- sys.path.append(os.getcwd())
- from sos.report import main
+ sys.path.insert(0, os.getcwd())
+ from sos import SoS
except KeyboardInterrupt:
raise SystemExit()
if __name__ == '__main__':
- main(sys.argv[1:])
+ msg = ("Please note the 'sosreport' command has been deprecated in favor "
+ "of the new 'sos' command, E.G. 'sos report'.\n"
+ "Redirecting to 'sos report %s'" % (' '.join(sys.argv[1:]) or ''))
+ print(msg)
+ time.sleep(0.5)
+ args = sys.argv[1:]
+ args.insert(0, 'report')
+ sos = SoS(args)
+ sos.execute()
# vim:ts=4 et sw=4