From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 8 Jun 2019 14:53:59 +0000 (+0100)
Subject: python: Drop set_capabilities function
X-Git-Tag: 0.9.28~1285^2~966
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1291126e13907d8a0e5840b4d1c54797ff13fb21;p=pakfire.git

python: Drop set_capabilities function

This is broken and will soon be implemented in the archive function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/_pakfire/_pakfiremodule.c b/src/_pakfire/_pakfiremodule.c
index a8f341966..519b7dac1 100644
--- a/src/_pakfire/_pakfiremodule.c
+++ b/src/_pakfire/_pakfiremodule.c
@@ -49,7 +49,6 @@ static PyMethodDef pakfireModuleMethods[] = {
 	{"performance_index", (PyCFunction)performance_index, METH_VARARGS, NULL},
 	{"version_compare", (PyCFunction)version_compare, METH_VARARGS, NULL},
 	{"get_capabilities", (PyCFunction)get_capabilities, METH_VARARGS, NULL},
-	{"set_capabilities", (PyCFunction)set_capabilities, METH_VARARGS, NULL},
 	{"personality", (PyCFunction)_personality, METH_VARARGS, NULL},
 	{"sync", (PyCFunction)_sync, METH_NOARGS, NULL},
 	{"unshare", (PyCFunction)_unshare, METH_VARARGS, NULL},
diff --git a/src/_pakfire/capabilities.c b/src/_pakfire/capabilities.c
index 4cd8e0949..de9b00dff 100644
--- a/src/_pakfire/capabilities.c
+++ b/src/_pakfire/capabilities.c
@@ -71,37 +71,3 @@ get_capabilities(PyObject *self, PyObject *args) {
 
 	return ret;
 }
-
-PyObject *
-set_capabilities(PyObject *self, PyObject *args) {
-	const char *filename;
-	const char *input;
-	char *exception = NULL;
-	char buf[STRING_SIZE];
-	cap_t cap_d;
-	int ret;
-
-	if (!PyArg_ParseTuple(args, "ss", &filename, &input)) {
-		/* XXX raise exception */
-		return NULL;
-	}
-
-	snprintf(buf, STRING_SIZE - 1, "= %s", input);
-	cap_d = cap_from_text(buf);
-	if (cap_d == NULL) {
-		PyErr_SetString(PyExc_ValueError, "Could not read capability string.");
-		return NULL;
-	}
-
-	ret = cap_set_file(filename, cap_d);
-	cap_free(cap_d);
-
-	if (ret != 0) {
-		snprintf(exception, STRING_SIZE - 1, "Failed to set capabilities on file %s (%s).",
-			filename, strerror(errno));
-		PyErr_SetString(PyExc_RuntimeError, exception);
-		return NULL;
-	}
-
-	return Py_BuildValue("i", ret);
-}
diff --git a/src/_pakfire/capabilities.h b/src/_pakfire/capabilities.h
index d077b43b7..ffadaa574 100644
--- a/src/_pakfire/capabilities.h
+++ b/src/_pakfire/capabilities.h
@@ -24,6 +24,5 @@
 #include <Python.h>
 
 extern PyObject *get_capabilities(PyObject *self, PyObject *args);
-extern PyObject *set_capabilities(PyObject *self, PyObject *args);
 
 #endif /* PYTHON_PAKFIRE_CAPS_H */
diff --git a/src/pakfire/packages/tar.py b/src/pakfire/packages/tar.py
index cd4306e05..b2758d7d6 100644
--- a/src/pakfire/packages/tar.py
+++ b/src/pakfire/packages/tar.py
@@ -92,12 +92,6 @@ class InnerTarFile(tarfile.TarFile):
 		else:
 			target = "/%s" % member.name
 
-		# ...and then apply the capabilities.
-		caps = member.pax_headers.get("PAKFIRE.capabilities", None)
-		if caps:
-			log.debug("Restoring capabilities for /%s: %s" % (member.name, caps))
-			util.set_capabilities(target, caps)
-
 
 class InnerTarFileXz(InnerTarFile):
 	@classmethod
diff --git a/src/pakfire/util.py b/src/pakfire/util.py
index 85fd6ce64..66b4e73cd 100644
--- a/src/pakfire/util.py
+++ b/src/pakfire/util.py
@@ -34,8 +34,8 @@ log = logging.getLogger("pakfire")
 from .constants import *
 from .i18n import _
 
-# Import binary version of version_compare and capability functions
-from ._pakfire import get_capabilities, set_capabilities, personality
+# Import binary version of capability functions
+from ._pakfire import get_capabilities, personality
 
 def cli_is_interactive():
 	"""