patch for pvdabeel@gentoo.org. -f and -C can now be used together on the cmdline

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@510 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 01d5ace45506623489c7257d9d47062e593e6963..b8893174735a7bd53f1832a96a6376c583d28dbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.137 2005/01/04 23:54:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.138 2005/01/05 00:17:37 zhen Exp $
+
+  04 Jan 2005; John Davis <zhen@gentoo.org> catalyst:
+  patch for pvdabeel@gentoo.org. -f and -C can now be used together on the
+  cmdline
 
   04 Jan 2005; John Davis <zhen@gentoo.org> modules/generic_stage_target.py,
   modules/livecd_stage2_target.py:

diff --git a/catalyst b/catalyst
index 4e33e50700d76d2cd626a466f80a3d9bf4cdc8e1..73fdb0b71039beb4ef7d4a64662cb8ddfe962e43 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.56 2005/01/02 04:15:51 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.57 2005/01/05 00:17:37 zhen Exp $
 
 # Maintained in full by John Davis <zhen@gentoo.org>
 
@@ -209,15 +209,6 @@ if __name__ == "__main__":
                usage()
                sys.exit(2)
        
-       # check to see if -f and -C are used together
-       for i in opts:
-               myopts.append(i[0])
-               
-       if ('-f' in myopts or '--file' in myopts) and ('-C' in myopts or '--cli' in myopts):
-               print "!!! catalyst: please specify one of either -f or -C\n"
-               usage()
-               sys.exit(2)
-
        for o, a in opts:
                if o in ("-h", "--help"):
                        usage()