This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e (commit) via 3a5a0d53bced32b42fd553952c2f74d52981d9ef (commit) from 984492b92f1b35534adddc24c2439fcdcb9885af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e Author: Michael Straube Date: Fri Dec 14 21:44:25 2018 +0100 libalpm/add.c: move assignment into conditional in alpm_add_pkg While at it and for consistency move the assignment of the variable 'local' into the subsequent conditional. Signed-off-by: Michael Straube Signed-off-by: Allan McRae commit 3a5a0d53bced32b42fd553952c2f74d52981d9ef Author: Michael Straube Date: Fri Dec 14 21:44:24 2018 +0100 Move skipping of duplicate sync/remove targets into libalpm sync: As pointed out by Andrew Gregory there could be an error when adding duplicates if they are two separate packages with the same name. Add a check in alpm_add_pkg() to test whether the duplicate is actually the same package, and if so, log a debug message and return success to skip the package. If the duplicate is a different package return ALPM_ERR_TRANS_DUP_TARGET and treat that error just like any other error in pacman. remove: Change alpm_remove_pkg() to just log a debug message and return success to skip duplicates. Remove the handling of ALPM_ERR_TRANS_DUP_TARGET in pacman. Also fixes FS#49377. Suggested-by: Andrew Gregory Signed-off-by: Michael Straube Signed-off-by: Allan McRae ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 11 ++++++++--- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 14 insertions(+), 21 deletions(-) hooks/post-receive -- The official pacman repository