Am Donnerstag, 3. Juni 2021 01:47:48 CEST schrieb Allan McRae:
On 3/6/21 1:29 am, Oskar Roesler (bionade24) via pacman-dev wrote:
Signed-off-by: Oskar Roesler (bionade24) <[email protected]>
---
 lib/libalpm/conflict.c | 4 ++--
 src/pacman/sync.c      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-) ...


These should not be changed.  They are only printed with --debug.
Ah, after looking at pacman code more deeply, those messages would be redundant then.

diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index b6da1a36..b0507d84 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -836,15 +836,15 @@ int sync_prepare_execute(void) ...

This adds "error: " to the start of the message, which is not needed as
this is the clarification of the error.

Use "fprintf(stderr, _(...))" instead.
I should have looked more deeply into the code here before using it, I'll change it.

                                                                        
conflict->file, conflict->target, conflict->ctarget);
                                                        break;
                                                case 
ALPM_FILECONFLICT_FILESYSTEM:
                                                        
if(conflict->ctarget[0]) {
-                                                               printf(_("%s: %s 
exists in filesystem (owned by %s)\n"), ...



Reply via email to