Added a "negate result" option

[sfa.git] / sfatables / sfatables

diff --git a/sfatables/sfatables b/sfatables/sfatables
index 2fd244d..9abcf6c 100755 (executable)
--- a/sfatables/sfatables
+++ b/sfatables/sfatables
@@ -91,6 +91,7 @@ def main():
         match_parser = create_parser_xml_ext(match_dict)
         matches_str = ",".join(match_dict.keys())
         match_parser.add_option('-m','--match',dest='name',help='Match name (one of %s)'%matches_str, metavar = 'MATCH')
+        match_parser.add_option('-n','--negate',dest='negate',help='Negate result',action=store_true)
         (match_options, args) = match_parser.parse_args(pargs[1])
         try:
             name = match_options.name
@@ -111,17 +112,17 @@ def main():
         target_dict = load_xml_extensions("sfatables.targets",target_dir,targets.all)
         target_parser = create_parser_xml_ext(target_dict)
         targets_str = ",".join(target_dict.keys())
-        target_parser.add_option('-j','--jump',dest='target_name',help='Target name (one of %s)'%targets, metavar = 'TARGET')
+        target_parser.add_option('-j','--jump',dest='name',help='Target name (one of %s)'%targets, metavar = 'TARGET')
         (target_options, args) = target_parser.parse_args(pargs[2])
         try:
-            target_name = target_options.target_name
+            name = target_options.name
         except Exception:
             print "Must specify target name with -m"
 
-        if (target_dict.has_key(target_name)):
-            setattr(target_options, 'arguments', target_dict[target_name].arguments)
+        if (target_dict.has_key(name)):
+            setattr(target_options, 'arguments', target_dict[name].arguments)
         else:
-            raise Exception('Target %s not found'%target_name)
+            raise Exception('Target %s not found'%name)
 
     else:
         target_options = None
@@ -130,5 +131,3 @@ def main():
 
 if __name__=='__main__':
     main()
-if __name__=='__main__':
-    main()