December 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] add vim modeline to test files
by Andrew Gregory 27 Dec '14

27 Dec '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/scripts/human_to_size_test.sh | 2 ++ test/scripts/parseopts_test.sh | 2 ++ test/util/pacsorttest.sh | 2 ++ test/util/vercmptest.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index dfa01f7..2dacfd1 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -80,3 +80,5 @@ parse_hts '1M' 1048576 parse_hts ' 1 G ' 1073741824 parse_hts '1Q' '' + +# vim: set noet: diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 2c055b1..97679c4 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -140,3 +140,5 @@ parse '--force --' 2 --force # exact match on possible stem (opt has optarg) parse '--clean foo --' 3 --clean=foo + +# vim: set noet: diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index 49d6d8e..a29d8f1 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -133,3 +133,5 @@ fi echo "# $failure of $run tests failed" exit 1 + +# vim: set noet: diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 9032cbf..ba279a7 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -151,3 +151,5 @@ fi echo "# $failure of $run tests failed" exit 1 + +# vim: set noet: -- 2.2.1

2 6

[pacman-dev] [PATCH] Fix .SRCINFO output with architecture specific fields
by Allan McRae 27 Dec '14

27 Dec '14

Do not merge the architecture specific fields when creating a .SRCINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 440848f..0db9912 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1622,7 +1622,10 @@ merge_arch_attrs() { source_buildfile() { source_safe "$@" - merge_arch_attrs + + if (( !SOURCEONLY )); then + merge_arch_attrs + fi } run_function_safe() { @@ -2137,8 +2140,6 @@ write_pkginfo() { local size="$(@DUPATH@ @DUFLAGS@)" size="$(( ${size%%[^0-9]*} * 1024 ))" - merge_arch_attrs - msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" -- 2.2.1

1 0

[pacman-dev] [PATCH] Clarify "assume installed" error message
by Allan McRae 27 Dec '14

27 Dec '14

The error message on failing to add an "assume installed" entry to the backend was not clear. Clarify by making "assume-installed" none translatable and adding a hyphen to match calling flag. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ffc4d5..65349f5 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -754,7 +754,7 @@ static int setup_libalpm(void) ret = alpm_option_add_assumeinstalled(handle, dep); if(ret) { - pm_printf(ALPM_LOG_ERROR, _("Failed to pass assume installed entry to libalpm")); + pm_printf(ALPM_LOG_ERROR, _("Failed to pass %s entry to libalpm"), "assume-installed"); alpm_dep_free(dep); return ret; } -- 2.2.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-46-g6356567
by allan＠archlinux.org 27 Dec '14

27 Dec '14

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 6356567ae0fb9927c80811642e7d949270fd5784 (commit) via 7c0ff7f4b7a88e10e8e9c3f4b90ca359eb0babef (commit) via 763fb3d9e7b82288f825f0038f2873eaec43ae08 (commit) via 804688ab6a036a80e082354c497ddc2d21ac2979 (commit) via 2f0ca00e5530d38e8ee2005f7d1129a92bf34231 (commit) via 60d958c78bf5c6fca761492b4849dd36f098eb41 (commit) via be4198b34e01242e481664776c51936a150c1ff8 (commit) via 32413213cb3aa532f64bd19024f9694a22875e21 (commit) via d5e93e895bdb3705f2baf83efcc7d56e86d927ed (commit) from 25b492aab691579c8edfc9f57831d055a3f82d74 (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 6356567ae0fb9927c80811642e7d949270fd5784 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 23 21:06:37 2014 -0500 makepkg: print the name of the source array being checked I don't see an easy fix to avoid printing this more than once, so let's at least differentiate the messaging so that it's more clear what's going on. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7c0ff7f4b7a88e10e8e9c3f4b90ca359eb0babef Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 23 21:06:36 2014 -0500 makepkg: call out the source array(s) missing checksums Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 763fb3d9e7b82288f825f0038f2873eaec43ae08 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 13:17:34 2014 +1000 Remove logically dead code in _alpm_local_db_write We can only get to cleanup: through fp being NULL due to fopen failing or normal execution when fclose is called. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 804688ab6a036a80e082354c497ddc2d21ac2979 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 12:57:38 2014 +1000 _alpm_run_chroot: only close working directory if it was opened Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f0ca00e5530d38e8ee2005f7d1129a92bf34231 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 12:26:39 2014 +1000 _alpm_db_add_pkgincache: free potential memory leak Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 60d958c78bf5c6fca761492b4849dd36f098eb41 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 11:55:49 2014 +1000 Initialize memory to prevent issues when freeing on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit be4198b34e01242e481664776c51936a150c1ff8 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 12:09:26 2014 +1000 _alpm_recursedeps: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32413213cb3aa532f64bd19024f9694a22875e21 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 11:59:55 2014 +1000 apply_deltas: fix memory leak on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5e93e895bdb3705f2baf83efcc7d56e86d927ed Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 11:57:11 2014 +1000 pacsort: fix memory leak Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 5 ----- lib/libalpm/conflict.c | 4 ++-- lib/libalpm/db.c | 2 ++ lib/libalpm/deps.c | 6 ++++-- lib/libalpm/sync.c | 4 ++-- lib/libalpm/util.c | 4 +++- scripts/makepkg.sh.in | 11 ++++++----- src/util/pacsort.c | 1 + 8 files changed, 20 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-37-g25b492a
by allan＠archlinux.org 27 Dec '14

27 Dec '14

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 25b492aab691579c8edfc9f57831d055a3f82d74 (commit) via 5221440b6bd0520762026a24abdde50d60552f99 (commit) via 286dc83451fe816b80a00806a7f15566ffcc23a7 (commit) from 1f1e53c208cfa0e284511470acb679fe10c4d80c (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 25b492aab691579c8edfc9f57831d055a3f82d74 Merge: 1f1e53c 5221440 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 27 17:07:04 2014 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-12-g5221440
by allan＠archlinux.org 27 Dec '14

27 Dec '14

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, maint has been updated via 5221440b6bd0520762026a24abdde50d60552f99 (commit) via 286dc83451fe816b80a00806a7f15566ffcc23a7 (commit) from d2d00e454353d5a420ce3406e9cd011e299d091d (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 5221440b6bd0520762026a24abdde50d60552f99 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 12:36:43 2014 +1000 fix duplication of package sha256sum Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 286dc83451fe816b80a00806a7f15566ffcc23a7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Dec 24 11:57:21 2014 -0500 makepkg: fix typo in dep array name We fixed this up to check architecture specific sources in ec679e09b2, but fudged the array name in the in_array call. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix typo in dep array name
by Dave Reisner 24 Dec '14

24 Dec '14

We fixed this up to check architecture specific sources in ec679e09b2, but fudged the array name in the in_array call. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d53c39f..ab4a784 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2925,7 +2925,7 @@ check_vcs_software() { uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then - if ! in_array "$client" ${alldeps[@]}; then + if ! in_array "$client" ${all_deps[@]}; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" ret=1 -- 2.2.1

1 0

[pacman-dev] [PATCH] Remove logically dead code in _alpm_local_db_write
by Allan McRae 24 Dec '14

24 Dec '14

We can only get to cleanup: through fp being NULL due to fopen failing or normal execution when fclose is called. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 0771aaf..2454cdc 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1036,11 +1036,6 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq cleanup: umask(oldmask); - - if(fp) { - fclose(fp); - } - return retval; } -- 2.2.1

1 0

[pacman-dev] [PATCH] _alpm_run_chroot: only close working directory if it was opened
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 43d0d7b..22408d7 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -542,7 +542,9 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) while(dup2(pipefd[1], 2) == -1 && errno == EINTR); close(pipefd[0]); close(pipefd[1]); - close(cwdfd); + if(cwdfd >= 0) { + close(cwdfd); + } /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { -- 2.2.1

1 0

[pacman-dev] [PATCH] fix duplication of package sha256sum
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I can only think we have not seen an error due to this because signatures overrule all checksums. lib/libalpm/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ce6b0a2..b186a4c 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -584,7 +584,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) newpkg->installdate = pkg->installdate; STRDUP(newpkg->packager, pkg->packager, goto cleanup); STRDUP(newpkg->md5sum, pkg->md5sum, goto cleanup); - STRDUP(newpkg->sha256sum, pkg->md5sum, goto cleanup); + STRDUP(newpkg->sha256sum, pkg->sha256sum, goto cleanup); STRDUP(newpkg->arch, pkg->arch, goto cleanup); newpkg->size = pkg->size; newpkg->isize = pkg->isize; -- 2.2.1

1 0