1 |
commit: ef6abbc6965ef11356a2dc393c2f4917cff4fee3 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 7 15:11:16 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 21 11:37:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6abbc6 |
7 |
|
8 |
sys-apps/util-linux: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
.../files/util-linux-2.32-python3-tests.patch | 105 --------------------- |
14 |
1 file changed, 105 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch |
17 |
deleted file mode 100644 |
18 |
index 7b8867ba034..00000000000 |
19 |
--- a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch |
20 |
+++ /dev/null |
21 |
@@ -1,105 +0,0 @@ |
22 |
-From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001 |
23 |
-From: Frank Schaefer <kelledin@×××××.com> |
24 |
-Date: Tue, 10 Jul 2018 20:21:02 -0500 |
25 |
-Subject: [PATCH] * break up large strings for PySys_WriteStdout() |
26 |
- |
27 |
---- |
28 |
- libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------ |
29 |
- 1 file changed, 43 insertions(+), 13 deletions(-) |
30 |
- |
31 |
-diff --git a/libmount/python/fs.c b/libmount/python/fs.c |
32 |
-index d6490d248..634a914ef 100644 |
33 |
---- a/libmount/python/fs.c |
34 |
-+++ b/libmount/python/fs.c |
35 |
-@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self) |
36 |
- return PyObjectResultInt(mnt_fs_get_devno(self->fs)); |
37 |
- } |
38 |
- |
39 |
-+static void _dump_debug_string(const char *lead, const char *s, char quote) |
40 |
-+{ |
41 |
-+ /* PySys_WriteStdout() will automatically truncate any '%s' token |
42 |
-+ * longer than a certain length (documented as 1000 bytes, but we |
43 |
-+ * give ourselves some margin here just in case). The only way I |
44 |
-+ * know to get around this is to print such strings in bite-sized |
45 |
-+ * chunks. |
46 |
-+ */ |
47 |
-+ static const unsigned int _PY_MAX_LEN = 900; |
48 |
-+ static const char *_PY_MAX_LEN_FMT = "%.900s"; |
49 |
-+ unsigned int len; |
50 |
-+ |
51 |
-+ if (lead != NULL) |
52 |
-+ PySys_WriteStdout("%s", lead); |
53 |
-+ |
54 |
-+ if (quote != 0) |
55 |
-+ PySys_WriteStdout("%c", quote); |
56 |
-+ |
57 |
-+ for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) |
58 |
-+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s); |
59 |
-+ |
60 |
-+ if (len > 0) |
61 |
-+ PySys_WriteStdout(_PY_MAX_LEN_FMT, s); |
62 |
-+ |
63 |
-+ if (quote != 0) |
64 |
-+ PySys_WriteStdout("%c\n", quote); |
65 |
-+ else |
66 |
-+ PySys_WriteStdout("\n"); |
67 |
-+} |
68 |
-+ |
69 |
- #define Fs_print_debug_HELP "print_debug()\n\n" |
70 |
- static PyObject *Fs_print_debug(FsObject *self) |
71 |
- { |
72 |
- PySys_WriteStdout("------ fs: %p\n", self->fs); |
73 |
-- PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs)); |
74 |
-- PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs)); |
75 |
-- PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs)); |
76 |
-+ _dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0); |
77 |
-+ _dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0); |
78 |
-+ _dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0); |
79 |
- |
80 |
- if (mnt_fs_get_options(self->fs)) |
81 |
-- PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs)); |
82 |
-+ _dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0); |
83 |
- if (mnt_fs_get_vfs_options(self->fs)) |
84 |
-- PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs)); |
85 |
-+ _dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0); |
86 |
- if (mnt_fs_get_fs_options(self->fs)) |
87 |
-- PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs)); |
88 |
-+ _dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0); |
89 |
- if (mnt_fs_get_user_options(self->fs)) |
90 |
-- PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs)); |
91 |
-+ _dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0); |
92 |
- if (mnt_fs_get_optional_fields(self->fs)) |
93 |
-- PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs)); |
94 |
-+ _dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\''); |
95 |
- if (mnt_fs_get_attributes(self->fs)) |
96 |
-- PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs)); |
97 |
-+ _dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0); |
98 |
- |
99 |
- if (mnt_fs_get_root(self->fs)) |
100 |
-- PySys_WriteStdout("root: %s\n", mnt_fs_get_root(self->fs)); |
101 |
-+ _dump_debug_string("root: ", mnt_fs_get_root(self->fs), 0); |
102 |
- |
103 |
- if (mnt_fs_get_swaptype(self->fs)) |
104 |
-- PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs)); |
105 |
-+ _dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0); |
106 |
- if (mnt_fs_get_size(self->fs)) |
107 |
- PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs)); |
108 |
- if (mnt_fs_get_usedsize(self->fs)) |
109 |
-@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self) |
110 |
- PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs)); |
111 |
- |
112 |
- if (mnt_fs_get_bindsrc(self->fs)) |
113 |
-- PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs)); |
114 |
-+ _dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0); |
115 |
- if (mnt_fs_get_freq(self->fs)) |
116 |
- PySys_WriteStdout("freq: %d\n", mnt_fs_get_freq(self->fs)); |
117 |
- if (mnt_fs_get_passno(self->fs)) |
118 |
-@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self) |
119 |
- if (mnt_fs_get_tid(self->fs)) |
120 |
- PySys_WriteStdout("tid: %d\n", mnt_fs_get_tid(self->fs)); |
121 |
- if (mnt_fs_get_comment(self->fs)) |
122 |
-- PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs)); |
123 |
-+ _dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\''); |
124 |
- return UL_IncRef(self); |
125 |
- } |
126 |
- /* |