mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-19 18:47:46 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
From a7bfeeb479d28c9a880d2a08d0102978fa711237 Mon Sep 17 00:00:00 2001
|
|
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
|
Date: Wed, 18 Jul 2012 20:07:01 -0400
|
|
Subject: [PATCH] Disable selinux
|
|
|
|
---
|
|
setup.py.in | 2 +-
|
|
slip/util/files.py | 28 ++++++++++++++--------------
|
|
2 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/setup.py.in b/setup.py.in
|
|
index d670ed5..d5b8db8 100644
|
|
--- a/setup.py.in
|
|
+++ b/setup.py.in
|
|
@@ -7,7 +7,7 @@ setup(name="slip", version="@VERSION@",
|
|
py_modules=["slip.__init__", "slip.util.__init__",
|
|
"slip.util.hookable", "slip.util.files",
|
|
"slip._wrappers.__init__", "slip._wrappers._gobject"],
|
|
- requires=["selinux"])
|
|
+ requires=[ ])
|
|
|
|
setup(name="slip.dbus", version="@VERSION@",
|
|
py_modules=["slip.dbus.__init__", "slip.dbus.bus",
|
|
diff --git a/slip/util/files.py b/slip/util/files.py
|
|
index 27ba45c..53869f6 100644
|
|
--- a/slip/util/files.py
|
|
+++ b/slip/util/files.py
|
|
@@ -24,7 +24,7 @@ __all__ = ["issamefile", "linkfile", "copyfile", "linkorcopyfile",
|
|
"overwrite_safely"]
|
|
|
|
import os
|
|
-import selinux
|
|
+# import selinux
|
|
import shutil
|
|
import tempfile
|
|
import errno
|
|
@@ -134,8 +134,8 @@ def copyfile(srcpath, dstpath, copy_mode_from_dst=True, run_restorecon=True):
|
|
|
|
os.rename(dsttmpfile.name, dstpath)
|
|
|
|
- if run_restorecon and selinux.is_selinux_enabled() > 0:
|
|
- selinux.restorecon(dstpath)
|
|
+# if run_restorecon and selinux.is_selinux_enabled() > 0:
|
|
+# selinux.restorecon(dstpath)
|
|
|
|
|
|
def linkorcopyfile(srcpath, dstpath, copy_mode_from_dst=True,
|
|
@@ -234,8 +234,8 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
|
|
|
|
exists = os.path.exists(path)
|
|
|
|
- if preserve_context and selinux.is_selinux_enabled() <= 0:
|
|
- preserve_context = False
|
|
+# if preserve_context and selinux.is_selinux_enabled() <= 0:
|
|
+# preserve_context = False
|
|
|
|
try:
|
|
fd, tmpname = tempfile.mkstemp(prefix=base + os.path.extsep,
|
|
@@ -244,10 +244,10 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
|
|
if exists and preserve_mode:
|
|
shutil.copymode(path, tmpname)
|
|
|
|
- if exists and preserve_context:
|
|
- ret, ctx = selinux.getfilecon(path)
|
|
- if ret < 0:
|
|
- raise RuntimeError("getfilecon(%r) failed" % path)
|
|
+# if exists and preserve_context:
|
|
+# ret, ctx = selinux.getfilecon(path)
|
|
+# if ret < 0:
|
|
+# raise RuntimeError("getfilecon(%r) failed" % path)
|
|
|
|
f = os.fdopen(fd, "w")
|
|
fd = None
|
|
@@ -259,11 +259,11 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
|
|
|
|
os.rename(tmpname, path)
|
|
|
|
- if preserve_context:
|
|
- if exists:
|
|
- selinux.setfilecon(path, ctx)
|
|
- else:
|
|
- selinux.restorecon(path)
|
|
+# if preserve_context:
|
|
+# if exists:
|
|
+# selinux.setfilecon(path, ctx)
|
|
+# else:
|
|
+# selinux.restorecon(path)
|
|
|
|
finally:
|
|
if f:
|
|
--
|
|
1.8.3.2
|
|
|