policycoreutils: Don't use subprocess.getstatusoutput() in Python 2 code
PATCH 1/1 policycoreutils: Don't use subprocess.getstatusoutput() in Python 2 code
The commit 7574a50f tried to improve compatibility with Python 3. It changed the code to use subprocess.getstatusoutput() instead of commands.getstatusoutput(). Unfortunately subprocess.getstatusoutput() is not available in Python 2. This patch changes how getstatusoutput() is imported so the code works on Python 2 and Python 3.
Fixes:
$ chcat -d something
Traceback (most recent call last):
File "/usr/bin/chcat", line 432, in <module>
sys.exit(chcat_replace(["s0"], cmds, login_ind))
File "/usr/bin/chcat", line 271, in chcat_replace
rc = subprocess.getstatusoutput(cmd)
AttributeError: 'module' object has no attribute 'getstatusoutput'--- policycoreutils/sandbox/start | 8 +++++--- policycoreutils/scripts/chcat | 17 ++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-)
policycoreutils/sandbox/start +5 -3
@@ -1,10 +1,12 @@ #! /usr/bin/python -Es -import gtk -import subprocess +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput import sys rc = [-1, ''] try: - rc = subprocess.getstatusoutput(sys.argv[1]) + rc = getstatusoutput(sys.argv[1]) except: pass if rc[0] == 0:
policycoreutils/scripts/chcat +10 -7
@@ -22,7 +22,10 @@ # 02111-1307 USA # # -import subprocess +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput import sys import os import pwd
@@ -92,7 +95,7 @@ def chcat_user_add(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
@@ -131,7 +134,7 @@ def chcat_add(orig, newcat, objects, login_ind): else: cat_string = cat cmd = 'chcon -l %s:%s %s' % (sensitivity, cat_string, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
@@ -172,7 +175,7 @@ def chcat_user_remove(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
@@ -217,7 +220,7 @@ def chcat_remove(orig, newcat, objects, login_ind): cmd = 'chcon -l %s %s' % (sensitivity, f) else: cmd = 'chcon -l %s:%s %s' % (sensitivity, cat, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
@@ -245,7 +248,7 @@ def chcat_user_replace(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
@@ -268,7 +271,7 @@ def chcat_replace(newcat, objects, login_ind): for f in objects: cmd = "%s %s" % (cmd, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
Signature · 1 line
1.8.3.1
James Carter
AppliedQuoted 15 lines · Petr Lautrbach
The commit
7574a50ftried to improve compatibility with Python 3. It changed the code to usesubprocess.getstatusoutput()instead ofcommands.getstatusoutput(). Unfortunatelysubprocess.getstatusoutput()is not available in Python 2. This patch changes howgetstatusoutput()is imported so the code works on Python 2 and Python 3.Fixes:
$ chcat -d something Traceback (most recent call last): File "/usr/bin/chcat", line 432, in <module> sys.exit(chcat_replace(["s0"], cmds, login_ind)) File "/usr/bin/chcat", line 271, in chcat_replace rc = subprocess.getstatusoutput(cmd) AttributeError: 'module' object has no attribute 'getstatusoutput'
Quoted 1 line
Signed-off-by Petr Lautrbach <[email protected]>
Applied.
Thanks,
Jim
Quoted 96 lines
--- policycoreutils/sandbox/start | 8 +++++--- policycoreutils/scripts/chcat | 17 ++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-)policycoreutils/sandbox/start +5
-3@@ -1,10 +1,12 @@ #! /usr/bin/python -Es -import gtk -import subprocess +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput import sys rc = [-1, ''] try: - rc = subprocess.getstatusoutput(sys.argv[1]) + rc = getstatusoutput(sys.argv[1]) except: pass if rc[0] == 0:policycoreutils/scripts/chcat +10
-7@@ -22,7 +22,10 @@ # 02111-1307 USA # # -import subprocess +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput import sys import os import pwd@@ -92,7 +95,7 @@ def chcat_user_add(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1@@ -131,7 +134,7 @@ def chcat_add(orig, newcat, objects, login_ind): else: cat_string = cat cmd = 'chcon -l %s:%s %s' % (sensitivity, cat_string, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1@@ -172,7 +175,7 @@ def chcat_user_remove(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1@@ -217,7 +220,7 @@ def chcat_remove(orig, newcat, objects, login_ind): cmd = 'chcon -l %s %s' % (sensitivity, f) else: cmd = 'chcon -l %s:%s %s' % (sensitivity, cat, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1@@ -245,7 +248,7 @@ def chcat_user_replace(newcat, users): cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) else: cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1@@ -268,7 +271,7 @@ def chcat_replace(newcat, objects, login_ind): for f in objects: cmd = "%s %s" % (cmd, f) - rc = subprocess.getstatusoutput(cmd) + rc = getstatusoutput(cmd) if rc[0] != 0: print(rc[1]) errors += 1
Signature · 2 lines
James Carter <[email protected]> National Security Agency