[policycoreutils] Fix semanage argparse bugs

Daniel J Walsh dwalsh at fedoraproject.org
Wed Jul 24 15:46:18 UTC 2013


commit 04c19314d57a0062fd077749cdbb35b6378660a9
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Jul 24 11:46:08 2013 -0400

    Fix semanage argparse bugs

 policycoreutils-rhat.patch |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 6f9b8f4..b5bbf4b 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -318093,7 +318093,7 @@ index 0000000..e2befdb
 +      packages=["policycoreutils"],
 +)
 diff --git a/policycoreutils/semanage/semanage b/policycoreutils/semanage/semanage
-index 6e33c85..da33e6d 100644
+index 6e33c85..37fff6e 100644
 --- a/policycoreutils/semanage/semanage
 +++ b/policycoreutils/semanage/semanage
 @@ -1,5 +1,7 @@
@@ -318105,7 +318105,7 @@ index 6e33c85..da33e6d 100644
  # see file 'COPYING' for use and warranty information
  #
  # semanage is a tool for managing SELinux configuration files
-@@ -19,564 +21,798 @@
+@@ -19,564 +21,797 @@
  #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA     
  #                                        02111-1307  USA
  #
@@ -318291,7 +318291,7 @@ index 6e33c85..da33e6d 100644
 +
 +def handleLogin(args):
 +    # {action:[conflict_opts,require_opts]}
-+    login_args = {'list':[('login','seuser'),('')],'add':[('locallist'),('seuser','login')],'modify':[('locallist'),('seuser','login')], 'delete':[('locallist'),('login')],'extract':[('locallist','login','range','seuser'),('')],'deleteall':[('locallist','login','range','seuser'),('')]}
++    login_args = {'list':[('login','seuser'),('')],'add':[('locallist'),('seuser','login')],'modify':[('locallist'),('seuser','login')], 'delete':[('locallist'),('login')],'extract':[('locallist','login','seuser'),('')],'deleteall':[('locallist','login','seuser'),('')]}
 +
 +    handle_opts(args,login_args,args.action)
 +
@@ -318405,7 +318405,6 @@ index 6e33c85..da33e6d 100644
 +        if args.equal:
 +            OBJECT.add_equal(args.file_spec, args.equal)
 +        else:
-+            print "Dan", args.file_spec, args.type, args.ftype, args.range, args.seuser
 +            OBJECT.add(args.file_spec, args.type, args.ftype, args.range, args.seuser)
 +    if args.action is "modify":
 +        if args.equal:


More information about the scm-commits mailing list