September 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacman: check versioned optdepends in -Qi operation
by Eli Schwartz 18 Sep '18

18 Sep '18

Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index e80c5953..ee43dca7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -170,7 +170,7 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) alpm_depend_t *optdep = i->data; char *depstring = alpm_dep_compute_string(optdep); if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), depstring)) { const char *installed = _(" [installed]"); depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); strcpy(depstring + strlen(depstring), installed); -- 2.19.0

2 1

[pacman-dev] [PATCH] scripts: deduplicate localized copyright messages
by Eli Schwartz 18 Sep '18

18 Sep '18

Fixes FS#58452 Also consistently add a blank line after the copyright and before the license terms. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Do the email address lines need to be translated? Anyway, currently updating the pacman copyright year dirties the translations. It could be interpolated but then the copyright year updating code needs to be as well. scripts/makepkg.sh.in | 5 +++-- scripts/pacman-db-upgrade.sh.in | 3 ++- scripts/pacman-key.sh.in | 3 ++- scripts/pkgdelta.sh.in | 3 ++- scripts/repo-add.sh.in | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 299f9f7f..b4d8fed4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1192,9 +1192,10 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$makepkg_version" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf -- "$(gettext "Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ -Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 9f27a2a2..55a3e8f7 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -54,8 +54,9 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ff460363..dd837c3f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -92,8 +92,9 @@ usage() { version() { printf "pacman-key (pacman) %s\n" "${myver}" + printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2010-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 2dc12c28..72e063b0 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -70,8 +70,9 @@ This delta file can then be added to a database using repo-add.\n")" version() { printf "pkgdelta (pacman) %s\n" "$myver" + printf -- "$(gettext "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3f181404..86bf9a88 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -93,8 +93,9 @@ See %s(8) for more details and descriptions of the available options.\n")" $cmd version() { cmd=${0##*/} printf "%s (pacman) %s\n\n" "$cmd" "$myver" + printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>.\n")" + printf '\n' printf -- "$(gettext "\ -Copyright (c) 2006-2018 Pacman Development Team <pacman-dev(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -- 2.17.0

2 5

[pacman-dev] [PATCH] pacman-conf: add missing DisableDownloadTimeout
by morganamilo 17 Sep '18

17 Sep '18

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/pacman-conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index baa72d97..56196f79 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -266,6 +266,7 @@ static void dump_config(void) show_bool("TotalDownload", config->totaldownload); show_bool("CheckSpace", config->checkspace); show_bool("VerbosePkgLists", config->verbosepkglists); + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); show_float("UseDelta", config->deltaratio); @@ -376,6 +377,8 @@ static int list_directives(void) show_bool("CheckSpace", config->checkspace); } else if(strcasecmp(i->data, "VerbosePkgLists") == 0) { show_bool("VerbosePkgLists", config->verbosepkglists); + } else if(strcasecmp(i->data, "DisableDownloadTimeout") == 0) { + show_bool("DisableDownloadTimeout", config->disable_dl_timeout); } else if(strcasecmp(i->data, "UseDelta") == 0) { show_float("UseDelta", config->deltaratio); -- 2.18.0

2 1

[pacman-dev] [PATCH 2/2] Change if-else chain to switch
by David Phillips 09 Sep '18

09 Sep '18

--- lib/libalpm/sync.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 85f70200..faef7b56 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1176,21 +1176,28 @@ static int check_validity(alpm_handle_t *handle, if(errors) { for(i = errors; i; i = i->next) { struct validity *v = i->data; - if(v->error == ALPM_ERR_PKG_MISSING_SIG) { + switch(v->error) { + case ALPM_ERR_PKG_MISSING_SIG: _alpm_log(handle, ALPM_LOG_ERROR, _("%s: missing required signature\n"), v->pkg->name); - } else if(v->error == ALPM_ERR_PKG_INVALID_SIG) { + break; + case ALPM_ERR_PKG_INVALID_SIG: _alpm_process_siglist(handle, v->pkg->name, v->siglist, v->siglevel & ALPM_SIG_PACKAGE_OPTIONAL, v->siglevel & ALPM_SIG_PACKAGE_MARGINAL_OK, v->siglevel & ALPM_SIG_PACKAGE_UNKNOWN_OK); + /* fallthrough */ + case ALPM_ERR_PKG_INVALID_CHECKSUM: prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_INVALID_CHECKSUM) { - prompt_to_delete(handle, v->path, v->error); - } else if(v->error == ALPM_ERR_PKG_NOT_FOUND || - v->error == ALPM_ERR_BADPERMS || - v->error == ALPM_ERR_PKG_OPEN) { + break; + case ALPM_ERR_PKG_NOT_FOUND: + case ALPM_ERR_BADPERMS: + case ALPM_ERR_PKG_OPEN: _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), v->path, alpm_strerror(v->error)); + break; + default: + /* ignore */ + break; } alpm_siglist_cleanup(v->siglist); free(v->siglist); -- 2.18.0

1 0