- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] repo-remove: fix checking for non-existent .db database
by Allan McRae 07 Feb '16

07 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7680d31..cab5e04 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -547,8 +547,8 @@ prepare_repo_db() { # TODO: remove if statement if [[ $repo == "db" ]]; then error "$(gettext "Repository file '%s' was not found.")" "$dbfile" + exit 1 fi - exit 1 ;; repo-add) # check if the file can be created (write permission, directory existence, etc) -- 2.7.0

2 1

[pacman-dev] [PATCH] only remove pacnew file if it is new
by Andrew Gregory 07 Feb '16

07 Feb '16

Check if we overwrote an exiting pacnew file before unlinking it. Otherwise, updating to a version with an unchanged file would delete existing pacnew files. FS#47993 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 18a8175..b8ac082 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -178,7 +178,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, char filename[PATH_MAX]; /* the actual file we're extracting */ int needbackup = 0, notouch = 0; const char *hash_orig = NULL; - int errors = 0; + int isnewfile = 0, errors = 0; struct stat lsbuf; size_t filename_len; @@ -226,7 +226,8 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, * 6- skip extraction, dir already exists. */ - if(llstat(filename, &lsbuf) != 0) { + isnewfile = (llstat(filename, &lsbuf) != 0 && errno == ENOENT); + if(isnewfile) { /* cases 1,2: file doesn't exist, skip all backup checks */ } else if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) { #if 0 @@ -301,6 +302,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, return 1; } strcpy(filename + filename_len, ".pacnew"); + isnewfile = (llstat(filename, &lsbuf) != 0 && errno == ENOENT); } _alpm_log(handle, ALPM_LOG_DEBUG, "extracting %s\n", filename); @@ -354,7 +356,9 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, * including any user changes */ _alpm_log(handle, ALPM_LOG_DEBUG, "action: leaving existing file in place\n"); - unlink(filename); + if(isnewfile) { + unlink(filename); + } } else if(hash_orig && hash_local && strcmp(hash_orig, hash_local) == 0) { /* installed file has NOT been changed by user, * update to the new version */ -- 2.7.0

2 1

[pacman-dev] [PATCH] Fix inconsistent status messages
by Stefan Tatschner 07 Feb '16

07 Feb '16

This patch fixes an inconsistency in the status messages. :: Proceed with installation? [Y/n] :: Retrieving packages ... <--- Space before "...". blas-3.6.0-4-x86_64 cblas-3.6.0-4-x86_64 lapack-3.6.0-4-x86_64 (3/3) checking keys in keyring (3/3) checking package integrity (3/3) loading package files (3/3) checking for file conflicts (3/3) checking available disk space :: Processing package changes... <--- No space before "..." (1/3) upgrading blas (2/3) upgrading cblas (3/3) upgrading lapack --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index cb3db10..1e1a4cd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -288,7 +288,7 @@ void cb_event(alpm_event_t *event) fputs(event->scriptlet_info.line, stdout); break; case ALPM_EVENT_RETRIEVE_START: - colon_printf(_("Retrieving packages ...\n")); + colon_printf(_("Retrieving packages...\n")); break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { -- 2.7.0

2 1

[pacman-dev] [PATCH] Log to file when running hooks
by Olivier Brunel 07 Feb '16

07 Feb '16

Useful if there's some output (to know where it comes from), or in case of failure. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- lib/libalpm/hook.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index ed79fdd..e49000e 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -736,7 +736,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) 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); + alpm_logaction(handle, ALPM_CALLER_PREFIX, "running '%s'...\n", hook->name); hook_event.type = ALPM_EVENT_HOOK_RUN_START; hook_event.name = hook->name; -- 2.7.0

2 1

[pacman-dev] [PATCH] doc/alpm-hooks: mention that hooks must have a ".hooks" suffix.
by Allan McRae 07 Feb '16

07 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/alpm-hooks.5.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/alpm-hooks.5.txt b/doc/alpm-hooks.5.txt index aee2ff8..979af49 100644 --- a/doc/alpm-hooks.5.txt +++ b/doc/alpm-hooks.5.txt @@ -33,7 +33,8 @@ DESCRIPTION libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more -'[Trigger]' section describing which transactions it should be run for. +'[Trigger]' section describing which transactions it should be run for. Hook +file names are required to have the suffix ".hook". TRIGGERS -------- -- 2.7.0

1 0

[pacman-dev] [PATCH] Make "makepkg -g" ignore the current architecture.
by Alastair Hughes 07 Feb '16

07 Feb '16

makepkg -g no longer works on PKGBUILDs which do not include the current architecture due to a change in the 4.2.1 -> 5.0.0 cycle. I'm not sure how to approach the fix, so I've just made "makepkg -g" set the IGNOREARCH flag. Is this a reasonable approach? The other option that I considered would be to move lint_pkgbuild to after GENINTEG is processed, but I think that having some sanity checking on the PKGBUILD's source array before downloading the sources would be helpful? On a related note, is there any tests for makepkg? I couldn't see any, but I may have missed something obvious. If so, then I could try to make a test for this case to ensure that it doesn't break again in the future.

2 3

[pacman-dev] [PATCH] libmakepkg: increase robustness of the detection of array variables
by Allan McRae 07 Feb '16

07 Feb '16

Extract array detection into its own utility function that ensures extglob is enabled. Suggested-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 6 +++--- scripts/libmakepkg/util/util.sh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 183e740..30c9909 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -43,7 +43,7 @@ lint_variable() { for i in ${array[@]} ${arch_array[@]}; do eval "keys=(\"\${!$i[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $i)" != "declare -a "* ]]; then + if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 fi @@ -57,7 +57,7 @@ lint_variable() { v="${i}_${a}" eval "keys=(\"\${!${v}[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $v)" != "declare -a "* ]]; then + if ! is_array $v; then error "$(gettext "%s_%s should be an array")" "$i" "$a" ret=1 fi @@ -68,7 +68,7 @@ lint_variable() { for i in ${string[@]}; do eval "keys=(\"\${!$i[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $i)" == "declare -a "* ]]; then + if is_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 fi diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh index 3c996da..675e75d 100644 --- a/scripts/libmakepkg/util/util.sh +++ b/scripts/libmakepkg/util/util.sh @@ -37,6 +37,23 @@ in_array() { return 1 # Not Found } +# tests if a variable is an array +is_array() { + local v=$1 + local ret=1 + + # this function requires extglob - save current options to restore later + local shellopts=$(shopt -p) + shopt -s extglob + + if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then + ret=0 + fi + + eval "$shellopts" + return $ret +} + # Canonicalize a directory path if it exists canonicalize_path() { local path="$1"; -- 2.7.0

1 0

[pacman-dev] [PATCH] Fix French translation files
by Allan McRae 07 Feb '16

07 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is now done in transifex... I post the patch as a reminder. scripts/po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 2870c0b..7db50e4 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -138,7 +138,7 @@ msgstr "ÉCHEC" #: scripts/makepkg.sh.in:478 msgid "Validating %s files with %s..." -msgstr "Validation des fichiers % avec %s..." +msgstr "Validation des fichiers %s avec %s..." #: scripts/makepkg.sh.in:485 msgid "One or more files did not pass the validity check!" -- 2.7.0

1 0

[pacman-dev] unexpected no-op when repo-remove
by Johannes Ernst 07 Feb '16

07 Feb '16

Fragment starting line 576 in repo-add/remove, pacman 5.0.0-1 case $cmd in repo-remove) # only a missing "db" database is currently an error # TODO: remove if statement if [[ $repo == "db" ]]; then error "$(gettext "Repository file '%s' was not found.")" "$dbfile" fi exit 1 ;; I believe you mean for the “exit 1” to be inside the “then” section, not outside. When invoking “repo-remove”, this produced exit 1, no error message, and no visible action. Turns out it works as expected if I comment out exit 1. Cheers, Johannes. Johannes Ernst upon2020.com @Johannes_Ernst GPG: http://upon2020.com/public/pubkey.txt Check out UBOS, the Linux distro for personal servers I work on: http://ubos.net/

1 0

[pacman-dev] [PATCH] Add the missing limits.h include to hook.c
by Alastair Hughes 04 Feb '16

04 Feb '16

Currently, pacman will not build against musl libc (and presumably some other libc implementations?) because PATH_MAX is undefined in hook.c. Fix that by including <limits.h>.

2 2