2007-08-20 David Smith <dsmith@redhat.com>

	From Lai Jiangshan <laijs@cn.fujitsu.com>
	* main.cxx (main): Make sure the '-c' and '-x' options can't be
	specified together.

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 292b9bdc..045ca353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20  David Smith  <dsmith@redhat.com>
+
+	From Lai Jiangshan <laijs@cn.fujitsu.com>
+	* main.cxx (main): Make sure the '-c' and '-x' options can't be
+	specified together.
+
 2007-08-17  Frank Ch. Eigler  <fche@elastic.org>
 
 	As suggested by "Zhaolei" <zhaolei@cn.fujitsu.com>:
diff --git a/main.cxx b/main.cxx
index e18a1331..eaf0a651 100644
--- a/main.cxx
+++ b/main.cxx
@@ -448,6 +448,12 @@ main (int argc, char * const argv [])
       usage (s, 1);
     }
 
+  if((s.cmd != "") && (s.target_pid))
+    {
+      cerr << "You can't specify -c and -x options together." <<endl;
+      usage (s, 1);
+    }
+
   if (s.last_pass > 4 && release_changed)
     {
       if (s.verbose)