5da4fbf19c
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- policycoreutils python gui sandbox dbus semodule-utils restorecond
27 lines
835 B
Diff
27 lines
835 B
Diff
From 18d06e7f84adad94efe1823a2fdccf62b04bf396 Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Grepl <mgrepl@redhat.com>
|
|
Date: Fri, 20 Feb 2015 16:42:01 +0100
|
|
Subject: [PATCH] We want to remove the trailing newline for
|
|
/etc/system_release.
|
|
|
|
---
|
|
python/sepolicy/sepolicy/__init__.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
|
index 37abc7b83a37..481c5d86232f 100644
|
|
--- a/python/sepolicy/sepolicy/__init__.py
|
|
+++ b/python/sepolicy/sepolicy/__init__.py
|
|
@@ -1218,7 +1218,7 @@ def get_os_version():
|
|
system_release = ""
|
|
try:
|
|
with open('/etc/system-release') as f:
|
|
- system_release = f.readline()
|
|
+ system_release = f.readline().rstrip()
|
|
except IOError:
|
|
system_release = "Misc"
|
|
|
|
--
|
|
2.32.0
|
|
|