Arch-projects June 2018

arch-projects@lists.archlinux.org

8 participants
18 discussions

[arch-projects] [dbscripts] Expected behavior of db-remove?
by Luke Shumaker 21 Jun '18

21 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> Following is a test-case for db-remove demonstrating a case where I'm not sure what the intended behavior is. Note that the test-case is identical to the existing "remove multiple packages" test-case, except that 'pkg-single-arch' has been added to the pkgs=() array. With pacman 5.0, the test-case would have passed, but with pacman 5.1, the test-case fails. With the pacman 5.1 version of repo-remove, if any of the named packages are not found, the entire transaction is aborted, and *no* packages are removed. With 5.0, it would have said "error", but still proceeded to remove the other named packages. So, in my test-case, because 'pkg-single-arch' is an x86_64 only package (while the others are x86_64 and i686), db-remove succeeds on x86_64, but fails to remove anything on i686 because pkg-single-arch isn't present there. Also note that despite saying "ERROR" and failing to do anything, db-remove has a 0 exit-code; the test-case failure doesn't happen until it calls checkRemovedPackage. So, what's the desired behavior here? Ignore packages that are already missing from the repo, or abort if any of the named packages aren't found? --- test/cases/db-remove.bats | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/cases/db-remove.bats b/test/cases/db-remove.bats index fe373bc..d72c9cf 100644 --- a/test/cases/db-remove.bats +++ b/test/cases/db-remove.bats @@ -44,6 +44,27 @@ load ../lib/common done } +@test "remove multiple packages - some single arch" { + local arches=('i686' 'x86_64') + local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b' 'pkg-simple-epoch' 'pkg-single-arch') + local pkgbase + local arch + + for pkgbase in ${pkgs[@]}; do + releasePackage extra ${pkgbase} + done + + db-update + + for arch in ${arches[@]}; do + db-remove extra ${arch} ${pkgs[@]} + done + + for pkgbase in ${pkgs[@]}; do + checkRemovedPackage extra ${pkgbase} + done +} + @test "remove any packages" { local pkgs=('pkg-any-a' 'pkg-any-b') local pkgbase -- Happy hacking, ~ Luke Shumaker

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch pacman-git deleted. 20131102-88-g2c68135
by eschwartz＠archlinux.org 20 Jun '18

20 Jun '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 "Official repo DB scripts". The branch, pacman-git has been deleted was 2c68135f4ab9db048db460bc949322ad7bb418eb - Log ----------------------------------------------------------------- 2c68135f4ab9db048db460bc949322ad7bb418eb pacman 5.1 compatibility ----------------------------------------------------------------------- hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch master updated. 20131102-89-g05dd9be
by eschwartz＠archlinux.org 20 Jun '18

20 Jun '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 "Official repo DB scripts". The branch, master has been updated via 05dd9be0db06d7f7cea0eff9f9f6f1993eb6d463 (commit) via 2c68135f4ab9db048db460bc949322ad7bb418eb (commit) from 656fd6d5d8f455492b1e51add9e6e1da8f911a7c (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 05dd9be0db06d7f7cea0eff9f9f6f1993eb6d463 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon May 28 19:45:15 2018 -0400 test: BUILDDIR must be owned by build user pacman 5.1 enforces this restriction. OTOH it is a simpler setup to set this as the user homedir directly in account creation (just like makechrootpkg has always done) than to create an additional, world-writable, directory. dockerfile: don't use tmpfs for /build ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- test/Dockerfile | 3 +-- test/lib/common.bash | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [dbscripts] [PATCH v2] test: Fix typoed variables
by Luke Shumaker 16 Jun '18

16 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> - ftpdir-cleanup: ${pkg[0]} -> ${pkgs[0]} This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 - test: common.bash: $pkgarches[@] -> ${pkgarches[@]} This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 --- Per Eli's request, I've squashed 2 previously separate commits together to form this. test/cases/ftpdir-cleanup.bats | 2 +- test/lib/common.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats index 8c713c6..74215d0 100644 --- a/test/cases/ftpdir-cleanup.bats +++ b/test/cases/ftpdir-cleanup.bats @@ -111,7 +111,7 @@ __checkRepoRemovedPackage() { ftpdir-cleanup for arch in ${arches[@]}; do - __checkRepoRemovedPackage extra ${pkg[0]} ${arch} + __checkRepoRemovedPackage extra ${pkgs[0]} ${arch} done checkRemovedPackage extra ${pkgs[0]} diff --git a/test/lib/common.bash b/test/lib/common.bash index 36c735f..b82643e 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -273,7 +273,7 @@ checkRemovedPackageDB() { if [[ ${pkgarches[@]} == any ]]; then tarches=(${ARCHES[@]}) else - tarches=($pkgarches[@]) + tarches=(${pkgarches[@]}) fi for db in ${DBEXT} ${FILESEXT}; do -- 2.17.1

1 0

[arch-projects] [devtools] [PATCH] test: common.bash: Fix syntax mistake: $pkgarches[@] -> ${pkgarches[@]}
by Luke Shumaker 16 Jun '18

16 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 --- test/lib/common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lib/common.bash b/test/lib/common.bash index 36c735f..b82643e 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -273,7 +273,7 @@ checkRemovedPackageDB() { if [[ ${pkgarches[@]} == any ]]; then tarches=(${ARCHES[@]}) else - tarches=($pkgarches[@]) + tarches=(${pkgarches[@]}) fi for db in ${DBEXT} ${FILESEXT}; do -- 2.17.1

2 1

[arch-projects] [devtools] [PATCH] test: ftpdir-cleanup: Fix variable name mistake: ${pkg[0]} -> ${pkgs[0]}
by Luke Shumaker 15 Jun '18

15 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 --- test/cases/ftpdir-cleanup.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats index 8c713c6..74215d0 100644 --- a/test/cases/ftpdir-cleanup.bats +++ b/test/cases/ftpdir-cleanup.bats @@ -111,7 +111,7 @@ __checkRepoRemovedPackage() { ftpdir-cleanup for arch in ${arches[@]}; do - __checkRepoRemovedPackage extra ${pkg[0]} ${arch} + __checkRepoRemovedPackage extra ${pkgs[0]} ${arch} done checkRemovedPackage extra ${pkgs[0]} -- 2.17.1

1 0

[arch-projects] [archweb] [PATCH 1/1] Highlighting row on hover in the search results. FS#53612
by nodivbyzero 11 Jun '18

11 Jun '18

--- sitestatic/archweb.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 209561f..ef178e8 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -698,11 +698,19 @@ table.results { } .results tr.odd { + background: #f5f5f5; + } + + .results tr.odd:hover { background: #fff; } .results tr.even { - background: #e4eeff; + background: #ccdfff; + } + + .results tr.even:hover { + background: #b3cfff; } .results .flagged { -- 2.17.0

2 1

[arch-projects] [projects][pacman] [PATCH] libalpm: ignore .hook suffix when sorting hooks
by Jouke Witteveen 09 Jun '18

09 Jun '18

It is desirable to have 'a-post.hook' ordered after 'a.hook'. For this, it is needed to ignore the suffix when sorting. --- Two years ago, I suggested this patch in https://bugs.archlinux.org/task/49653. Today, I do so again :-). Regards, - Jouke lib/libalpm/hook.c | 16 ++++++++++++---- lib/libalpm/hook.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 0805e661..d90ed2da 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -551,7 +551,16 @@ static int _alpm_hook_triggered(alpm_handle_t *handle, struct _alpm_hook_t *hook static int _alpm_hook_cmp(struct _alpm_hook_t *h1, struct _alpm_hook_t *h2) { - return strcmp(h1->name, h2->name); + size_t suflen = strlen(ALPM_HOOK_SUFFIX), l1, l2; + int ret; + l1 = strlen(h1->name) - suflen; + l2 = strlen(h2->name) - suflen; + /* exclude the suffixes from comparison */ + ret = strncmp(h1->name, h2->name, l1 <= l2 ? l1 : l2); + if(ret == 0 && l1 != l2) { + return l1 < l2 ? -1 : 1; + } + return ret; } static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) @@ -634,8 +643,7 @@ 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; + size_t suflen = strlen(ALPM_HOOK_SUFFIX), triggered = 0; int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { @@ -681,7 +689,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) memcpy(path + dirlen, entry->d_name, name_len + 1); if(name_len < suflen - || strcmp(entry->d_name + name_len - suflen, suffix) != 0) { + || strcmp(entry->d_name + name_len - suflen, ALPM_HOOK_SUFFIX) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); continue; } diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index 364d22d7..30d565df 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -22,6 +22,8 @@ #include "alpm.h" +#define ALPM_HOOK_SUFFIX ".hook" + int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* ALPM_HOOK_H */ -- 2.17.1

2 1

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Arch-projects June 2018