- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.2
by Andrew Gregory 25 Dec '18

25 Dec '18

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, release/5.1.x has been updated via 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 (commit) via f8c73464c9cf86d6b917542585d74514f150c67b (commit) via 48a6adee3e63d335ac431ff6a67351988e574b79 (commit) from cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 (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 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sun Dec 23 14:33:01 2018 -0800 Release v5.1.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> commit f8c73464c9cf86d6b917542585d74514f150c67b Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sun Dec 23 14:30:49 2018 -0800 update NEWS for v5.1.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> commit 48a6adee3e63d335ac431ff6a67351988e574b79 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:12 2018 -0800 always allow explicit empty siglevel for sync dbs An empty siglevel does not do any signature verification which is exactly what we want when compiled without gpg support. This is already allowed in other parts of the codebase and required for the test suite to pass when compiled without gpg support. Fixes: FS#60880 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 61fe73804305a8bbb434cdc245944df5284f1964) ----------------------------------------------------------------------- Summary of changes: NEWS | 15 +++++++++++++++ configure.ac | 4 ++-- doc/index.asciidoc | 1 + lib/libalpm/be_sync.c | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman/query: print ignored for updates in databases without usage upgrade
by Michael Straube 18 Dec '18

18 Dec '18

Updates in databases that are not "Usage = Upgrade" will be ignored in a -Su operation. Add [ignored] to the -Qu output for such updates. Fixes FS#59854 Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- src/pacman/query.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..405dc61a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -325,10 +325,12 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { + int usage; alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); - if(alpm_pkg_should_ignore(config->handle, pkg)) { + alpm_db_get_usage(alpm_pkg_get_db(newpkg), &usage); + if(alpm_pkg_should_ignore(config->handle, pkg) || !(usage & ALPM_DB_USAGE_UPGRADE)) { printf(" %s", _("[ignored]")); } } -- 2.20.0

2 2

[pacman-dev] [PATCH] Move skipping of duplicate sync/remove targets into libalpm
by Michael Straube 13 Dec '18

13 Dec '18

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 <andrew.gregory.8(a)gmail.com> Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- lib/libalpm/add.c | 9 ++++++++- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e415bb17..f357c076 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -53,6 +53,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) const char *pkgname, *pkgver; alpm_trans_t *trans; alpm_pkg_t *local; + alpm_pkg_t *dup; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -70,7 +71,13 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package '%s'\n", pkgname); - if(alpm_pkg_find(trans->add, pkgname)) { + dup = alpm_pkg_find(trans->add, pkgname); + if(dup) { + if(dup == pkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, _("skipping duplicate target: %s\n"), pkgname); + return 0; + } + /* error for separate packages with the same name */ RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 78ca5be7..ffdc0da5 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -74,7 +74,8 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) pkgname = pkg->name; if(alpm_pkg_find(trans->remove, pkgname)) { - RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); + _alpm_log(handle, ALPM_LOG_DEBUG, _("skipping duplicate target: %s\n"), pkgname); + return 0; } _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2269ed8..9d44cf53 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -44,14 +44,8 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); - return -1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); + return -1; } config->explicit_removes = alpm_list_add(config->explicit_removes, pkg); return 0; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 57677a42..2406fed5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -521,15 +521,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), - alpm_strerror(err)); - return 1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), alpm_strerror(err)); + return 1; } config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); return 0; -- 2.20.0

2 2

[pacman-dev] [PATCH] scripts/library: fix typo in README
by Michael Straube 12 Dec '18

12 Dec '18

Simply fix a typo: in written -> is written Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- scripts/library/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/library/README b/scripts/library/README index b99b0bc8..d20f117a 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -5,6 +5,6 @@ human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If successful, the converted byte value is written to stdout and the function -returns 0. If an error occurs, nothing in written and the function returns 1. +returns 0. If an error occurs, nothing is written and the function returns 1. Results may be inaccurate when using a broken implementation of awk, such as mawk or busybox awk. -- 2.19.2

4 9

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.1-9-gcfa1e8b5
by Allan McRae 12 Dec '18

12 Dec '18

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, release/5.1.x has been updated via cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 (commit) from 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 (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 cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 12 11:11:12 2018 +1000 Pull updated translations from Transifex Mostly churn in string headers, but a few new or updated translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ar.po | 40 ++-- lib/libalpm/po/ast.po | 40 ++-- lib/libalpm/po/bg.po | 40 ++-- lib/libalpm/po/br.po | 88 ++++---- lib/libalpm/po/ca.po | 72 +++---- lib/libalpm/po/cs.po | 40 ++-- lib/libalpm/po/da.po | 40 ++-- lib/libalpm/po/de.po | 40 ++-- lib/libalpm/po/el.po | 40 ++-- lib/libalpm/po/en_GB.po | 40 ++-- lib/libalpm/po/eo.po | 40 ++-- lib/libalpm/po/es.po | 40 ++-- lib/libalpm/po/es_419.po | 40 ++-- lib/libalpm/po/eu.po | 40 ++-- lib/libalpm/po/eu_ES.po | 40 ++-- lib/libalpm/po/fi.po | 40 ++-- lib/libalpm/po/fr.po | 40 ++-- lib/libalpm/po/gl.po | 40 ++-- lib/libalpm/po/hr.po | 40 ++-- lib/libalpm/po/hu.po | 40 ++-- lib/libalpm/po/id.po | 40 ++-- lib/libalpm/po/it.po | 40 ++-- lib/libalpm/po/ja.po | 40 ++-- lib/libalpm/po/kk.po | 40 ++-- lib/libalpm/po/ko.po | 50 ++--- lib/libalpm/po/libalpm.pot | 40 ++-- lib/libalpm/po/lt.po | 40 ++-- lib/libalpm/po/nb.po | 66 +++--- lib/libalpm/po/nl.po | 53 ++--- lib/libalpm/po/pl.po | 40 ++-- lib/libalpm/po/pt.po | 40 ++-- lib/libalpm/po/pt_BR.po | 40 ++-- lib/libalpm/po/ro.po | 40 ++-- lib/libalpm/po/ru.po | 40 ++-- lib/libalpm/po/sk.po | 40 ++-- lib/libalpm/po/sl.po | 44 ++-- lib/libalpm/po/sr.po | 40 ++-- lib/libalpm/po/sr(a)latin.po | 40 ++-- lib/libalpm/po/sv.po | 40 ++-- lib/libalpm/po/tr.po | 44 ++-- lib/libalpm/po/uk.po | 40 ++-- lib/libalpm/po/zh_CN.po | 44 ++-- lib/libalpm/po/zh_TW.po | 40 ++-- scripts/po/bg.po | 218 ++++++++++---------- scripts/po/br.po | 212 +++++++++---------- scripts/po/ca.po | 458 +++++++++++++++++++++--------------------- scripts/po/cs.po | 212 +++++++++---------- scripts/po/da.po | 231 ++++++++++----------- scripts/po/de.po | 212 +++++++++---------- scripts/po/el.po | 212 +++++++++---------- scripts/po/en_GB.po | 212 +++++++++---------- scripts/po/eo.po | 222 ++++++++++---------- scripts/po/es.po | 218 ++++++++++---------- scripts/po/es_419.po | 212 +++++++++---------- scripts/po/eu.po | 212 +++++++++---------- scripts/po/eu_ES.po | 212 +++++++++---------- scripts/po/fi.po | 212 +++++++++---------- scripts/po/fr.po | 219 ++++++++++---------- scripts/po/gl.po | 212 +++++++++---------- scripts/po/hu.po | 212 +++++++++---------- scripts/po/id.po | 212 +++++++++---------- scripts/po/it.po | 212 +++++++++---------- scripts/po/ja.po | 218 ++++++++++---------- scripts/po/ko.po | 222 ++++++++++---------- scripts/po/lt.po | 225 +++++++++++---------- scripts/po/nb.po | 321 +++++++++++++++-------------- scripts/po/nl.po | 223 ++++++++++---------- scripts/po/pacman-scripts.pot | 212 +++++++++---------- scripts/po/pl.po | 212 +++++++++---------- scripts/po/pt.po | 218 ++++++++++---------- scripts/po/pt_BR.po | 212 +++++++++---------- scripts/po/ro.po | 212 +++++++++---------- scripts/po/ru.po | 212 +++++++++---------- scripts/po/sk.po | 242 +++++++++++----------- scripts/po/sr.po | 212 +++++++++---------- scripts/po/sr(a)latin.po | 212 +++++++++---------- scripts/po/sv.po | 214 ++++++++++---------- scripts/po/tr.po | 222 ++++++++++---------- scripts/po/uk.po | 212 +++++++++---------- scripts/po/zh_CN.po | 212 +++++++++---------- scripts/po/zh_TW.po | 212 +++++++++---------- src/pacman/po/ca.po | 208 +++++++++---------- src/pacman/po/da.po | 10 +- src/pacman/po/ko.po | 6 +- src/pacman/po/lt.po | 9 +- src/pacman/po/nb.po | 32 +-- src/pacman/po/pt.po | 4 +- src/pacman/po/sk.po | 60 +++--- src/pacman/po/sl.po | 4 +- src/pacman/po/sr.po | 2 +- src/pacman/po/sr(a)latin.po | 2 +- src/pacman/po/sv.po | 2 +- src/pacman/po/tr.po | 4 +- src/pacman/po/zh_CN.po | 40 ++-- src/pacman/po/zh_TW.po | 7 +- 95 files changed, 5422 insertions(+), 5376 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-84-gb109d709
by Allan McRae 12 Dec '18

12 Dec '18

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 b109d7096b3f3f3244b7bb3796be658393eff98a (commit) via 77b8ca70322a121a2efb5318042e664246d3ec0e (commit) via d73fed4e134a1912df7bbc6a50c2287023ea1c4a (commit) from b67ec905205d96ca6801626a65149724f47f36f0 (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 b109d7096b3f3f3244b7bb3796be658393eff98a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 23:47:58 2018 -0500 meson: add trailing slashes to directory components in configuration defines This matches what we currently do in the autotools build configuration, and ensures that the default pacman-conf definitions for unspecified values consistently end with the trailing directory slashes. This has ramifications for thirdparty tools that up to now, have relied on this slash being there. Those tools should be fixed to prevent breaking when custom locations are set, but this is no reason not to fix it on our end as well. An extra trailng slash should never cause harm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 77b8ca70322a121a2efb5318042e664246d3ec0e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 01:15:19 2018 -0500 meson: install the directories needed for successful pacman operation This was neglected in the initial meson port. We need these directories to exist in order to bootstrap a new installation. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d73fed4e134a1912df7bbc6a50c2287023ea1c4a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 01:15:18 2018 -0500 meson: remove useless mkdir -p directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: meson.build | 15 ++++++++++++--- scripts/libmakepkg/meson.build | 7 ------- 2 files changed, 12 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] meson: add trailing slashes to directory components in configuration defines
by Eli Schwartz 11 Dec '18

11 Dec '18

This matches what we currently do in the autotools build configuration, and ensures that the default pacman-conf definitions for unspecified values consistently end with the trailing directory slashes. This has ramifications for thirdparty tools that up to now, have relied on this slash being there. Those tools should be fixed to prevent breaking when custom locations are set, but this is no reason not to fix it on our end as well. An extra trailng slash should never cause harm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 138a1934..0a710653 100644 --- a/meson.build +++ b/meson.build @@ -72,10 +72,10 @@ conf.set_quoted('LDCONFIG', LDCONFIG) conf.set_quoted('LIB_VERSION', meson.project_version()) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) -conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman')) -conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg')) +conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) +conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/')) conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log')) -conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg')) +conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) -- 2.20.0

1 0

[pacman-dev] [PATCH 1/2] meson: remove useless mkdir -p
by Eli Schwartz 10 Dec '18

10 Dec '18

directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index bfba56a5..b0697f78 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -11,8 +11,6 @@ libmakepkg_modules = [ { 'name' : 'util', 'has_subdir' : true }, ] -mkdir_p = 'mkdir -p $DESTDIR/@0@' - foreach module : libmakepkg_modules custom_target( 'libmakepkg_@0@'.format(module['name']), @@ -24,10 +22,5 @@ foreach module : libmakepkg_modules if module.get('has_subdir', false) subdir(module['name']) - path = join_paths(get_option('prefix'), - get_option('datadir'), - 'makepkg', - module['name']) - meson.add_install_script('sh', '-c', mkdir_p.format(path)) endif endforeach -- 2.20.0

1 1

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-81-gb67ec905
by Allan McRae 10 Dec '18

10 Dec '18

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 b67ec905205d96ca6801626a65149724f47f36f0 (commit) via 36a5069a599f2f7d10eb8ad1a2074581f33ff040 (commit) via f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 (commit) via 9f1b735d76d04665d6324e723e163a52ca27567c (commit) via 65e09705d3ad781fd41cf1996f2b60e2e2c1975b (commit) via f615f7bd5ae2764bd58e2947e0f33e75fa182078 (commit) from 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (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 b67ec905205d96ca6801626a65149724f47f36f0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 3 09:36:36 2018 -0500 Enable additional debug flags/logging with debugoptimized builds This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36a5069a599f2f7d10eb8ad1a2074581f33ff040 Author: Michael Straube <michael.straube(a)posteo.de> Date: Sun Dec 9 18:31:50 2018 +0100 scripts/library: fix typo in README Simply fix a typo: in written -> is written Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:30 2018 -0800 check localdb before upgrading package Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#55534 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f1b735d76d04665d6324e723e163a52ca27567c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 27 23:00:36 2018 -0500 libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 65e09705d3ad781fd41cf1996f2b60e2e2c1975b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Dec 2 20:44:24 2018 -0500 Make `make distcheck` work when bash-completion is installed. bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f615f7bd5ae2764bd58e2947e0f33e75fa182078 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 3 15:00:40 2018 +1000 configure.ac: use $datarootdir instead of $prefix/share Even worse, makepkg-template ignored $prefix completely. ----------------------------------------------------------------------- Summary of changes: Makefile.am | 3 ++- configure.ac | 4 ++-- lib/libalpm/add.c | 2 +- meson.build | 2 +- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------ scripts/library/README | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + test/pacman/tests/replace-and-upgrade-package.py | 27 ++++++++++++++++++++++++ 17 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py hooks/post-receive -- The official pacman repository

1 0