aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-12-10 10:43:31 +0000
committernavid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-12-10 10:43:31 +0000
commit01da3242947b4e77517f018f84c0b0b2434d4f76 (patch)
treea9e8cac586915d3de6c81f99f196d713bcb3cb84 /src
parent3d81f47b2026d243a2b2d757bfb5986ac5f14238 (diff)
downloadsos-01da3242947b4e77517f018f84c0b0b2434d4f76.tar.gz
handle legacy -norpm with a warning
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@467 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sosreport8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sosreport b/src/sosreport
index a75397b3..37a88a47 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -194,7 +194,13 @@ if sys.argv[0].endswith("sysreport"):
if not sys.stdin.isatty():
print
os.execl("/bin/sh", "/bin/sh", "-c", "/usr/sbin/sysreport.legacy")
- os.exit(-1)
+ sys.exit(-1)
+
+if "-norpm" in sys.argv:
+ print
+ print """WARNING: sysreport's "-norpm" option is deprecated, please use "-k rpm.rpmva=off" instead."""
+ print
+ sys.exit(1)
(__cmdLineOpts__, __cmdLineArgs__)=__cmdParser__.parse_args()