- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Changed implicit NULL check to explicit one, to comply with style guide.
by Terry Bolt 23 Dec '15

23 Dec '15

Signed-off-by: Terry Bolt <bolt.terry(a)gmail.com> --- lib/libalpm/diskspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 5bb2173..7ee1289 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -62,7 +62,7 @@ static void mount_point_list_free(alpm_list_t *mount_points) { alpm_list_t *i; - for(i = mount_points; i; i = i->next) { + for(i = mount_points; i != NULL; i = i->next) { alpm_mountpoint_t *data = i->data; FREE(data->mount_dir); } -- 2.6.4

2 4

[pacman-dev] [PATCH] Do not warn about missing files in NoExtract
by Allan McRae 21 Dec '15

21 Dec '15

The CheckSpace option checks the size of all files in a package being replaced and gives a warning when it can not read the file. However, files in NoExtract are expected to be missing and should not be warned about. Fixes FS#47470. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/diskspace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 5bb2173..b80139f 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -237,8 +237,10 @@ static int calculate_removed_size(alpm_handle_t *handle, snprintf(path, PATH_MAX, "%s%s", handle->root, filename); if(llstat(path, &st) == -1) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get file information for %s\n"), filename); + if(!alpm_option_match_noextract(handle, filename)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get file information for %s\n"), filename); + } continue; } -- 2.6.4

1 0

[pacman-dev] [PATCH] Update README for pacman-5.0
by Allan McRae 21 Dec '15

21 Dec '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- README | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/README b/README index 8c17d33..b96cef0 100644 --- a/README +++ b/README @@ -567,11 +567,28 @@ API CHANGES BETWEEN 4.2 AND 5.0 [REMOVED] - alpm_siglevel_t - removed members ALPM_SIG_PACKAGE_SET, ALPM_SIG_PACKAGE_TRUST_SET - -- ALPM_EVENT_PACORIG_CREATED -- alpm_event_pacorig_created_t -- alpm_event_t.pacorig_created +- removed .pacorig generation + - ALPM_EVENT_PACORIG_CREATED + - alpm_event_pacorig_created_t + - alpm_event_t.pacorig_created [ADDED] +- hook support + - alpm_option_get_hookdirs() + - alpm_option_set_hookdirs() + - alpm_option_add_hookdir() + - alpm_option_remove_hookdir() + - alpm_event_hook_t, alpm_event_hook_run_t + - alpm_hook_when_t + - ALPM_EVENT_HOOK_START, ALPM_EVENT_HOOK_DONE + - ALPM_EVENT_HOOK_RUN_START, ALPM_EVENT_HOOK_RUN_DONE + - ALPM_ERR_TRANS_HOOK_FAILED +- different database extension support + - alpm_option_get_dbext() + - alpm_option_set_dbext() - pkgbase accessor - alpm_pkg_get_base() +- transaction events + - ALPM_EVENT_TRANSACTION_START, ALPM_EVENT_TRANSACTION_DONE +- database unlocking + - alpm_unlock() -- 2.6.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-298-ga671fa4
by allan＠archlinux.org 21 Dec '15

21 Dec '15

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 a671fa497c7317e240e014e93bddfdbf1d270b2b (commit) via eadf38960776e36df75d6c3caf3a35b976acc56c (commit) via 8454daa7feef14b660561f2434448d0b4ac0576d (commit) via 686fae6d74c79310b5a8da04414a07ed9da299e1 (commit) via d721bae443fe020bf755d0440684a17b75de970f (commit) via 760bea543211673884c254b7e0c44e0f70fe2257 (commit) via 8d3bd4ec13940da70f946e6e63d59a05c89cbb50 (commit) via 132ec4c3b9f761fb76ff9cf567f3723db62d72df (commit) via 3802cab56374b50d4775d9deaf229cdef5cdbe53 (commit) from f98541400b7ede2d4a99de5f2f6a25257b545a98 (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 a671fa497c7317e240e014e93bddfdbf1d270b2b Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Dec 14 16:52:35 2015 +0100 makepkg: Output full URL in case of download failure Most entries in $sources contain variables so finding out why a URL fails to download is hard because one has to manually replace the variables when looking at the PKGBUILD. Simply output the full URL here so that it can be easily seen what is wrong. Old: ==> ERROR: Failure while downloading example-1.2.4.tar.gz New: ==> ERROR: Failure while downloading http://example.org/releases/1.1/example-1.2.4.tar.gz With the new format it is much more obvious that the directory name is the culprint (1.1 vs 1.2) while the old one would not display that information. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eadf38960776e36df75d6c3caf3a35b976acc56c Author: Olivier Brunel <jjk(a)jjacky.com> Date: Tue Dec 15 09:14:37 2015 +0100 alpm: Abort ASAP on failure in pre-transaction hooks There is no need to run any/remaining pre-transaction hooks as soon as a failure has occured, which will lead to aborting the transaction. So if an error occured during the first phase (reading directories/parsing files), or as soon as a hook flagged abort_on_fail does fail, we stop processing them and return. (For post-transaction hooks, all hooks are run regardless since there's no aborting.) Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8454daa7feef14b660561f2434448d0b4ac0576d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 23:53:53 2015 +1000 makepkg: run pkgver() and prepare() with --noextract Modifications made to the source before running with --noextract may alter the version string returned by pkgver(). Always run this function if present and check build status before proceeding. Fixes FS#46800. Also run prepare() when --noextract is used (unless --noprepare is specified). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 686fae6d74c79310b5a8da04414a07ed9da299e1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 23:17:26 2015 +1000 Give error message when --files will do nothing Point people towards the help when using "pacman -F" or "pacman -F foo". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d721bae443fe020bf755d0440684a17b75de970f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 20:23:26 2015 +1000 alpm-hooks: add Description field The "Description" field allows a hook to provide a some text for frontends to use in describing what the hook is doing. For example: Description = updating info page directory Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 760bea543211673884c254b7e0c44e0f70fe2257 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 15:48:44 2015 +1000 Show progress processing hooks Introduces the ALPM_EVENT_HOOK_RUN_{START,DONE} events that are triggered at the start and end of running an individual hook. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8d3bd4ec13940da70f946e6e63d59a05c89cbb50 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 13:39:58 2015 +1000 Add ALPM_EVENT_TRANSACTION_{START,DONE} events This provides a way to detect when the processing of package changes starts, allowing pacman to delineate hook output and package installation/removal output. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 132ec4c3b9f761fb76ff9cf567f3723db62d72df Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sun Dec 6 18:35:37 2015 +0100 Add events ALPM_EVENT_HOOK_{START,DONE} Add events to let frontends know when hooks are being processed (and when it's done), as that might be useful to update the UI. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> commit 3802cab56374b50d4775d9deaf229cdef5cdbe53 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 14 12:40:26 2015 +1000 Collect all triggered hooks before running them Having a first pass that checks which hooks are triggered followed by a second pass of the triggered hooks allows us to only provide output when a hook is actually triggered. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/alpm-hooks.5.txt | 5 ++++ doc/makepkg.8.txt | 10 ++++---- lib/libalpm/alpm.h | 46 ++++++++++++++++++++++++++++++++- lib/libalpm/hook.c | 50 +++++++++++++++++++++++++++++++++--- lib/libalpm/hook.h | 7 +---- lib/libalpm/trans.c | 5 ++++ scripts/libmakepkg/source/file.sh.in | 2 +- scripts/makepkg.sh.in | 17 ++++++------ src/pacman/callback.c | 40 ++++++++++++++++++++++++----- src/pacman/files.c | 7 ++++- 10 files changed, 157 insertions(+), 32 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] alpm: Abort ASAP on failure in pre-transaction hooks
by Olivier Brunel 15 Dec '15

15 Dec '15

There is no need to run all/remaining pre-transaction hooks as soon as a failure has occured, which will lead to aborting the transaction. So as soon as an error in the first phase (reading directories/parsing files) occurs, or a hook flagged abort_on_fail does fail, we stop processing and return. (For post-transaction hooks, all hooks are run regardless since there's no aborting.) Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- As discussed earlier with Andrew, this "replaces" the previous "alpm: Add event ALPM_EVENT_HOOK_RUN_FAILED" patch I sent. lib/libalpm/hook.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index acd571d..9b204fb 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -624,6 +624,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) struct dirent entry, *result; DIR *d; + if(ret != 0 && when == ALPM_HOOK_PRE_TRANSACTION) { + break; + } + if((dirlen = strlen(i->data)) >= PATH_MAX) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), (char *)i->data, strerror(ENAMETOOLONG)); @@ -648,6 +652,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) struct stat buf; size_t name_len; + if(ret != 0 && when == ALPM_HOOK_PRE_TRANSACTION) { + break; + } + if(strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { continue; } @@ -708,6 +716,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) closedir(d); } + if(ret != 0 && when == ALPM_HOOK_PRE_TRANSACTION) { + goto cleanup; + } + hooks = alpm_list_msort(hooks, alpm_list_count(hooks), (alpm_list_fn_cmp)_alpm_hook_cmp); @@ -743,6 +755,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) hook_event.type = ALPM_EVENT_HOOK_RUN_DONE; EVENT(handle, &hook_event); + + if(ret != 0 && when == ALPM_HOOK_PRE_TRANSACTION) { + break; + } } event.type = ALPM_EVENT_HOOK_DONE; -- 2.6.4

2 3

[pacman-dev] [PATCH 1/3] Collect all triggered hooks before running them
by Allan McRae 15 Dec '15

15 Dec '15

Having a first pass that checks which hooks are triggered followed by a second pass of the triggered hooks allows up to only provide output when a hook is actually triggered. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/hook.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index f5627af..ca90c4d 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -610,9 +610,9 @@ static int _alpm_hook_run_hook(alpm_handle_t *handle, struct _alpm_hook_t *hook) int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) { - alpm_list_t *i, *hooks = NULL; + alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL; const char *suffix = ".hook"; - size_t suflen = strlen(suffix); + size_t suflen = strlen(suffix), triggered = 0; int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { @@ -712,13 +712,25 @@ int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) for(i = hooks; i; i = i->next) { struct _alpm_hook_t *hook = i->data; if(hook && hook->when == when && _alpm_hook_triggered(handle, hook)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name); - if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) { - ret = -1; - } + hooks_triggered = alpm_list_add(hooks_triggered, hook); + triggered++; + } + } + + if(triggered == 0) { + goto cleanup; + } + + for(i = hooks_triggered; i; i = i->next) { + struct _alpm_hook_t *hook = i->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name); + if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) { + ret = -1; } } + alpm_list_free(hooks_triggered); + cleanup: alpm_list_free_inner(hooks, (alpm_list_fn_free) _alpm_hook_free); alpm_list_free(hooks); -- 2.6.4

3 7

[pacman-dev] [PATCH] Show progress processing hooks
by Allan McRae 14 Dec '15

14 Dec '15

Introduces the ALPM_EVENT_HOOK_RUN_{START,DONE} events that are triggered at the start and end of running an individual hook. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The output looks like: $ sudo ./src/pacman/pacman -S abs warning: abs-2.4.4-2 is up to date -- reinstalling resolving dependencies... looking for conflicting packages... Packages (1) abs-2.4.4-2 Total Installed Size: 0.03 MiB Net Upgrade Size: 0.00 MiB :: Proceed with installation? [Y/n] (1/1) checking keys in keyring [######################] 100% (1/1) checking package integrity [######################] 100% (1/1) loading package files [######################] 100% (1/1) checking for file conflicts [######################] 100% :: Processing package changes... (1/1) reinstalling abs [######################] 100% :: Running post-transaction hooks... (1/2) one.hook (2/2) two.hook lib/libalpm/alpm.h | 18 +++++++++++++++++- lib/libalpm/hook.c | 14 +++++++++++++- src/pacman/callback.c | 13 +++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8fcdfdf..f6e6b86 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -461,7 +461,11 @@ typedef enum _alpm_event_type_t { /** Processing hooks will be started. */ ALPM_EVENT_HOOK_START, /** Processing hooks is finished. */ - ALPM_EVENT_HOOK_DONE + ALPM_EVENT_HOOK_DONE, + /** A hook is starting */ + ALPM_EVENT_HOOK_RUN_START, + /** A hook has finnished runnning */ + ALPM_EVENT_HOOK_RUN_DONE } alpm_event_type_t; typedef struct _alpm_event_any_t { @@ -559,6 +563,17 @@ typedef struct _alpm_event_hook_t { alpm_hook_when_t when; } alpm_event_hook_t; +typedef struct _alpm_event_hook_run_t { + /** Type of event.*/ + alpm_event_type_t type; + /** Text to be outputted */ + const char *desc; + /** position of hook being run */ + size_t position; + /** total hooks being run */ + size_t total; +} alpm_event_hook_run_t; + /** Events. * This is an union passed to the callback, that allows the frontend to know * which type of event was triggered (via type). It is then possible to @@ -576,6 +591,7 @@ typedef union _alpm_event_t { alpm_event_pacnew_created_t pacnew_created; alpm_event_pacsave_created_t pacsave_created; alpm_event_hook_t hook; + alpm_event_hook_run_t hook_run; } alpm_event_t; /** Event callback. */ diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index df41fce..acd571d 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -611,6 +611,7 @@ static int _alpm_hook_run_hook(alpm_handle_t *handle, struct _alpm_hook_t *hook) int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) { alpm_event_hook_t event = { .when = when }; + alpm_event_hook_run_t hook_event; alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL; const char *suffix = ".hook"; size_t suflen = strlen(suffix), triggered = 0; @@ -725,12 +726,23 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) event.type = ALPM_EVENT_HOOK_START; EVENT(handle, &event); - for(i = hooks_triggered; i; i = i->next) { + hook_event.position = 1; + hook_event.total = triggered; + + for(i = hooks_triggered; i; i = i->next, hook_event.position++) { struct _alpm_hook_t *hook = i->data; _alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name); + + hook_event.type = ALPM_EVENT_HOOK_RUN_START; + hook_event.desc = hook->name; + EVENT(handle, &hook_event); + if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) { ret = -1; } + + hook_event.type = ALPM_EVENT_HOOK_RUN_DONE; + EVENT(handle, &hook_event); } event.type = ALPM_EVENT_HOOK_DONE; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c33bd24..ae725d3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -172,6 +172,18 @@ void cb_event(alpm_event_t *event) event->hook.when == ALPM_HOOK_PRE_TRANSACTION ? _("pre-transaction") : _("post-transaction")); break; + case ALPM_EVENT_HOOK_RUN_START: + { + alpm_event_hook_run_t *e = &event->hook_run; + int digits = 1; + size_t tmp = e->total; + while((tmp /= 10)) { + ++digits; + } + printf("(%*zu/%*zu) %s\n", digits, e->position, + digits, e->total, e->desc); + } + break; case ALPM_EVENT_CHECKDEPS_START: printf(_("checking dependencies...\n")); break; @@ -339,6 +351,7 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_RETRIEVE_DONE: case ALPM_EVENT_RETRIEVE_FAILED: case ALPM_EVENT_HOOK_DONE: + case ALPM_EVENT_HOOK_RUN_DONE: /* we can safely ignore those as well */ case ALPM_EVENT_PKGDOWNLOAD_START: case ALPM_EVENT_PKGDOWNLOAD_DONE: -- 2.6.4

3 7

[pacman-dev] [PATCH] makepkg: run pkgver() and prepare() with --noextract
by Allan McRae 14 Dec '15

14 Dec '15

Modifications made to the source before running with --noextract may alter the version string returned by pkgver(). Always run this function if present and check build status before proceeding. Fixes FS#46800. Also run prepare() when --noextract is used (unless --noprepare is specified). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5853ce..53163a2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2205,14 +2205,15 @@ elif (( !REPKG )); then fi extract_sources - if (( PKGVERFUNC )); then - update_pkgver - basever=$(get_full_version) - check_build_status - fi - if (( PREPAREFUNC )); then - run_prepare - fi +fi + +if (( PKGVERFUNC )); then + update_pkgver + basever=$(get_full_version) + check_build_status +fi +if (( PREPAREFUNC )); then + run_prepare fi if (( NOBUILD )); then -- 2.6.4

2 1

[pacman-dev] [PATCH] alpm-hooks: add Description field
by Allan McRae 14 Dec '15

14 Dec '15

The "Description" field allows a hook to provide a some text for frontends to use in describing what the hook is doing. For example: Description = updating info page directory Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I'm not sure if "Description" is the best label, but could not think of anything better. doc/alpm-hooks.5.txt | 5 +++++ lib/libalpm/hook.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/alpm-hooks.5.txt b/doc/alpm-hooks.5.txt index 3729387..f33ff8c 100644 --- a/doc/alpm-hooks.5.txt +++ b/doc/alpm-hooks.5.txt @@ -19,6 +19,7 @@ Type = File|Package (Required) Target = <Path|PkgName> (Required, Repeatable) [Action] (Required) +Description = ... (Optional) When = PreTransaction|PostTransaction (Required) Exec = <Command> (Required) Depends = <PkgName> (Optional) @@ -63,6 +64,10 @@ defined the hook will run if the transaction matches *any* of the triggers. ACTIONS ------- +* Description =* ...:: + An optional description that describes the action being taken by the + hook for use in front-end output. + *Exec =* <command>:: Command to run. Command arguments are split on whitespace. Values containing whitespace should be enclosed in quotes. Required. diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index acd571d..7d0f4f2 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -48,6 +48,7 @@ struct _alpm_trigger_t { struct _alpm_hook_t { char *name; + char *desc; alpm_list_t *triggers; alpm_list_t *depends; char **cmd; @@ -84,6 +85,7 @@ static void _alpm_hook_free(struct _alpm_hook_t *hook) { if(hook) { free(hook->name); + free(hook->desc); _alpm_wordsplit_free(hook->cmd); alpm_list_free_inner(hook->triggers, (alpm_list_fn_free) _alpm_trigger_free); alpm_list_free(hook->triggers); @@ -316,6 +318,10 @@ static int _alpm_hook_parse_cb(const char *file, int line, } else { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } + } else if(strcmp(key, "Description") == 0) { + char *val; + STRDUP(val, value, return 1); + hook->desc = val; } else if(strcmp(key, "Depends") == 0) { char *val; STRDUP(val, value, return 1); @@ -734,7 +740,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) _alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name); hook_event.type = ALPM_EVENT_HOOK_RUN_START; - hook_event.desc = hook->name; + hook_event.desc = hook->desc ? hook->desc : hook->name; EVENT(handle, &hook_event); if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) { -- 2.6.4

3 2

Re: [pacman-dev] [PATCH v2 1/1] libalpm: generate alpm.h on the fly and add version information
by Christian Hesse 14 Dec '15

14 Dec '15

Allan McRae <allan(a)archlinux.org> on Sun, 2015/12/06 10:33: > On 06/12/15 06:33, Christian Hesse wrote: > > Allan McRae <allan(a)archlinux.org> on Sun, 2015/11/29 09:10: > >> On 30/12/14 02:53, Christian Hesse wrote: > >>> 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> > >> > >> Follow-up on an old patch... Is the version provided by pkg-config > >> file not enough? > > > > The version provided by pkg-config is fine if you want to make configure > > check for a required version. But that does not help if you want to > > support older libalpm in third party software and API changes, no? For > > example packagekit dropped support for pacman < 4.2 (libalpm < 9) with > > the last API change. > > Isn't that the whole point of the configure check? I do not get the point... With pkg-config I can check the version and break with something like: configure: error: Package requirements (libalpm >= 8.2.0) were not met: But I would like to support the older code with something like this: #if ALPM_VERSION_NUMBER < 0x090000 /* legacy code here */ #else /* for recent library */ #endif I can't do that with pkg-config, no? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

2 1