- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/1] libalpm: add version information to alpm.h
by Christian Hesse 29 Dec '14

29 Dec '14

From: Christian Hesse <mail(a)eworm.de> Programs linked against libalpm (for example packagekit) may want to use preprocessor macros to check version and choose correct API. This adds version information to alpm.h. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/alpm.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 91b9461..e3f6e67 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -23,6 +23,14 @@ #ifndef _ALPM_H #define _ALPM_H +#define ALPM_VERSION "9.0.0" + +#define ALPM_VERSION_MAJOR 9 +#define ALPM_VERSION_MINOR 0 +#define ALPM_VERSION_PATCH 0 + +#define ALPM_VERSION_NUMBER 0x090000 + #ifdef __cplusplus extern "C" { #endif -- 2.2.1

3 3

[pacman-dev] [PATCH 0/9] refactor ini/config parser
by Andrew Gregory 29 Dec '14

29 Dec '14

As the first step to back-end hook support, this patchset makes the ini parser suitable for sharing between alpm and pacman by moving all error handling from the ini parser to the _parse_directive callback. This involves: * moving debug output to the callback * allowing empty section names (alpm already rejects empty db names) * moving Include handling to the callback * notifying the callback of read errors In order to do that I also refactored the config callback to use only a single pass by storing repo information until alpm is initialized and using bitmasks instead of the ALPM_SIG_*_SET enums to handle siglevel inheritance. apg Andrew Gregory (9): conf.c: store repo settings in dedicated struct conf.c: use masks for siglevel inheritance conf.c: parse config in a single pass ini.c: remove final callback call ini.c: move Include parsing to conf.c ini.c: remove unnecessary helper function ini.c: remove empty section name restriction ini.c: remove useless key check ini.c: move error output into conf.c lib/libalpm/alpm.h | 3 - lib/libalpm/be_sync.c | 2 +- src/pacman/conf.c | 304 ++++++++++++++++++++++++++++---------------------- src/pacman/conf.h | 16 +++ src/pacman/ini.c | 147 ++++-------------------- 5 files changed, 208 insertions(+), 264 deletions(-) -- 1.9.2

3 22

[pacman-dev] [PATCH] makepkg-template: Remove linenumber/file from errors
by Florian Pritz 28 Dec '14

28 Dec '14

die prints "at $scriptname line $linenumber." if the string does not end with "\n". This information is not of much use for us and it makes testing harder because we'd to remove it there. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg-template.pl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index d9da167..4bfd4d6 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -109,7 +109,7 @@ sub load_template { my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); if (!$version) { - die sprintf(gettext("Couldn't detect version for template '%s'"), $values->{name}); + die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name}); } my $parsed = process_file($path); @@ -128,7 +128,7 @@ sub process_file { my $nesting_level = 0; my $linenumber = 0; - open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s"), $filename, $!); + open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s\n"), $filename, $!); my @lines = <$fh>; close $fh; -- 2.2.1

1 0

[pacman-dev] [PATCH 1/5] Split install reason changing into its own function
by Allan McRae 28 Dec '14

28 Dec '14

Prepare for other functions to be added to the --database option. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/database.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/pacman/database.c b/src/pacman/database.c index e858e0c..dac0ab1 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -35,11 +35,12 @@ * * @return 0 on success, 1 on failure */ -int pacman_database(alpm_list_t *targets) +static int change_install_reason(alpm_list_t *targets) { alpm_list_t *i; alpm_db_t *db_local; - int retval = 0; + int ret = 0; + alpm_pkgreason_t reason; if(targets == NULL) { @@ -68,7 +69,7 @@ int pacman_database(alpm_list_t *targets) if(!pkg || alpm_pkg_set_reason(pkg, reason)) { pm_printf(ALPM_LOG_ERROR, _("could not set install reason for package %s (%s)\n"), pkgname, alpm_strerror(alpm_errno(config->handle))); - retval = 1; + ret = 1; } else { if(reason == ALPM_PKG_REASON_DEPEND) { printf(_("%s: install reason has been set to 'installed as dependency'\n"), pkgname); @@ -82,7 +83,20 @@ int pacman_database(alpm_list_t *targets) if(trans_release() == -1) { return 1; } - return retval; + return ret; +} + + +int pacman_database(alpm_list_t *targets) +{ + int ret = 0; + + if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { + ret = change_install_reason(targets); + return ret; + } + + return ret; } /* vim: set noet: */ -- 2.2.1

1 4

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

28 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 f1e010a5a7c562da02a74ffb043520760db49ba3 (commit) via 29c0d8233b32ab3ad1dcd7c3bf1161449a386dea (commit) via 4c4890dd1cad52a420788e6c30a8e6eca8f83c38 (commit) via 2759858e8c784dbce6fd60bf032efe96b40a9032 (commit) via acc639adf20da077ed6f0141289d953997be92f8 (commit) from 6356567ae0fb9927c80811642e7d949270fd5784 (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 f1e010a5a7c562da02a74ffb043520760db49ba3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Dec 23 16:16:08 2014 -0500 add tap_ prefix to test helper functions Allows tap.sh to show the line number where the helper function was called on failures. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 29c0d8233b32ab3ad1dcd7c3bf1161449a386dea Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Dec 23 16:09:58 2014 -0500 use tap.sh for bash tests tap.sh is a reusable TAP library that handles test counting and provides useful diagnostic messages on test failures. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4c4890dd1cad52a420788e6c30a8e6eca8f83c38 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 24 15:45:27 2014 +1000 Clarify "assume installed" error message 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> commit 2759858e8c784dbce6fd60bf032efe96b40a9032 Merge: 6356567 acc639a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 13:06:04 2014 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- scripts/makepkg.sh.in | 7 +- src/pacman/conf.c | 2 +- test/scripts/human_to_size_test.sh | 73 ++++++----------- test/scripts/parseopts_test.sh | 100 ++++++++--------------- test/tap.sh | 163 +++++++++++++++++++++++++++++++++++++ test/util/pacsorttest.sh | 90 ++++++++------------ test/util/vercmptest.sh | 151 +++++++++++++--------------------- 8 files changed, 318 insertions(+), 270 deletions(-) create mode 100644 test/tap.sh hooks/post-receive -- The official pacman repository

1 0

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

28 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 acc639adf20da077ed6f0141289d953997be92f8 (commit) from 5221440b6bd0520762026a24abdde50d60552f99 (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 acc639adf20da077ed6f0141289d953997be92f8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 27 23:20:36 2014 +1000 Fix .SRCINFO output with architecture specific fields Do not merge the architecture specific fields when creating a .SRCINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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