diff options
Diffstat (limited to 'meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch')
-rw-r--r-- | meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch b/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch deleted file mode 100644 index 9c49e33b02..0000000000 --- a/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From b0902e36108b49e6bc88d6b251cc2f8cffcd5a13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ricardo Ribalda <ricardo@ribalda.com> | ||
3 | Date: Sun, 5 Apr 2020 11:40:30 +0000 | ||
4 | Subject: [PATCH] pseudo: On a DB fixup remove files that do not exist anymore | ||
5 | |||
6 | If the user decides to fix a database, remove the files that do not | ||
7 | exist anymore. | ||
8 | If only DB test is selected do not change the behaviour (return error). | ||
9 | |||
10 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | ||
11 | Upstream-Status: Submitted [https://lists.openembedded.org/g/openembedded-core/message/137045] | ||
12 | --- | ||
13 | pseudo.c | 13 ++++++++++--- | ||
14 | 1 file changed, 10 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/pseudo.c b/pseudo.c | ||
17 | index 0f5850e..98e5b0c 100644 | ||
18 | --- a/pseudo.c | ||
19 | +++ b/pseudo.c | ||
20 | @@ -1087,9 +1087,15 @@ pseudo_db_check(int fix) { | ||
21 | int fixup_needed = 0; | ||
22 | pseudo_debug(PDBGF_DB, "Checking <%s>\n", m->path); | ||
23 | if (lstat(m->path, &buf)) { | ||
24 | - errors = EXIT_FAILURE; | ||
25 | - pseudo_diag("can't stat <%s>\n", m->path); | ||
26 | - continue; | ||
27 | + if (!fix) { | ||
28 | + pseudo_diag("can't stat <%s>\n", m->path); | ||
29 | + errors = EXIT_FAILURE; | ||
30 | + continue; | ||
31 | + } else { | ||
32 | + pseudo_debug(PDBGF_DB, "can't stat <%s>\n", m->path); | ||
33 | + fixup_needed = 2; | ||
34 | + goto do_fixup; | ||
35 | + } | ||
36 | } | ||
37 | /* can't check for device type mismatches, uid/gid, or | ||
38 | * permissions, because those are the very things we | ||
39 | @@ -1125,6 +1131,7 @@ pseudo_db_check(int fix) { | ||
40 | S_ISDIR(m->mode)); | ||
41 | fixup_needed = 2; | ||
42 | } | ||
43 | + do_fixup: | ||
44 | if (fixup_needed) { | ||
45 | /* in fixup mode, either delete (mismatches) or | ||
46 | * correct (dev/ino). | ||
47 | -- | ||
48 | 2.21.1 | ||
49 | |||