From 01da3242947b4e77517f018f84c0b0b2434d4f76 Mon Sep 17 00:00:00 2001
From: navid <navid@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Mon, 10 Dec 2007 10:43:31 +0000
Subject: handle legacy -norpm with a warning

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@467 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/sosreport | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

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()
 
-- 
cgit