October 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] signing: modify question text with unknwon uid
by Christian Hesse 07 Oct '19

07 Oct '19

From: Christian Hesse <mail(a)eworm.de> If the key's uid is unknown (for example with db signatures) the question was: :: Import PGP key 02FD1C7A934E614545849F19A6234074498E9CEE, "(null)"? [Y/n] Let's display a modified question for unknwon uid. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/callback.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 25528100..3e67c1d8 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -456,8 +456,14 @@ void cb_question(alpm_question_t *question) case ALPM_QUESTION_IMPORT_KEY: { alpm_question_import_key_t *q = &question->import_key; - q->import = yesno(_("Import PGP key %s, \"%s\"?"), - q->key->fingerprint, q->key->uid); + /* the uid is unknwon with db signatures */ + if (q->key->uid == NULL) { + q->import = yesno(_("Import PGP key %s with unknown uid?"), + q->key->fingerprint); + } else { + q->import = yesno(_("Import PGP key %s, \"%s\"?"), + q->key->fingerprint, q->key->uid); + } } break; }

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-227-gd5c3ed12
by Allan McRae 07 Oct '19

07 Oct '19

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 d5c3ed129c80c7a0676994d06c140f5e67b8b07d (commit) from 5d2e48d17f5a6268c8d290320da85da8dca19b85 (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 d5c3ed129c80c7a0676994d06c140f5e67b8b07d Author: Jonas Witschel <diabonas(a)archlinux.org> Date: Mon Oct 7 12:56:02 2019 +0200 pacman-key: receive keys from WKD with -r/--recv-keys If an email address is specified, we use --locate-key to look up the key using WKD and keyserver as a fallback. If the key is specified as a key ID, this doesn't work, so we use the normal keyserver-based --recv-keys. Note that --refresh-keys still uses the keyservers exclusively for refreshing, though the situation might potentially be improved in a new version of GnuPG: https://lists.gnupg.org/pipermail/gnupg-users/2019-July/062169.html Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/pacman-key.sh.in | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/5] Manage signing keys using a WKD (FS#63171)
by Jonas Witschel 07 Oct '19

07 Oct '19

Hi, as explained in https://bugs.archlinux.org/task/63171, it would be nice if pacman could receive new PGP keys and refresh expired ones using a Web Key Directory (WKD) instead of using keyservers. This patch series adds the corresponding functionality to pacman and pacman-key. Since WKD is not enabled on archlinux.org yet, it might be a little early to merge this as I have only been able to test it locally on my machine. However since this is my first potential pacman contribution, I wanted to get it out early to gather some feedback on the code. Unfortunately GnuPG/GPGME handles WKD keys quite differently from keyserver keys, so you have to jump through some hoops to enable the usual cofirm-then-import workflow for keys. WKD support for pacman is complete, so it would be possible to remove the keyserver code and rely solely on WKD if the need should arise (though this would require changes to the Arch Linux packaging policy, see the bug report). pacman-key on the other hand is lacking a convenient way of refreshing all keys using WKD, currently every key needs to be refreshed manually by e-mail address using "pacman-key -r". This is because "gpg --refresh-keys" is hardwired to use keyservers. Hopefully the situation will change in future versions of GnuPG, see the corresponding commit message for reference, if not we need to work around this by listing every key in the keyring by email and doing a refresh using WKD. Cheers, Jonas Jonas Witschel (5): common: move rmrf to util-common signing: add ability to import keys using a WKD sync: lookup missing keys in the WKD using the packager email be_package: lookup missing keys in the WKD using the packager email pacman-key: receive keys from WKD with -r/--recv-keys lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 12 ++- lib/libalpm/signing.c | 175 ++++++++++++++++++++++++++++----------- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 9 +- lib/libalpm/util.c | 23 +++++ lib/libalpm/util.h | 1 + scripts/pacman-key.sh.in | 19 +++-- src/common/util-common.c | 42 ++++++++++ src/common/util-common.h | 2 + src/pacman/util.c | 40 --------- src/pacman/util.h | 1 - 12 files changed, 226 insertions(+), 101 deletions(-) -- 2.22.0

4 30

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-226-g5d2e48d1
by Allan McRae 07 Oct '19

07 Oct '19

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 5d2e48d17f5a6268c8d290320da85da8dca19b85 (commit) from 7e79cf73fac6fdd7d6cbfb35fe240b137e81c028 (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 5d2e48d17f5a6268c8d290320da85da8dca19b85 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 7 18:12:24 2019 +1000 Pull and push translation changes in preparation for 5.2 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ar.po | 117 ++-- lib/libalpm/po/ast.po | 104 ++-- lib/libalpm/po/bg.po | 126 +++-- lib/libalpm/po/br.po | 124 +++-- lib/libalpm/po/ca.po | 448 ++++++++-------- lib/libalpm/po/cs.po | 128 ++--- lib/libalpm/po/da.po | 129 ++--- lib/libalpm/po/de.po | 169 +++--- lib/libalpm/po/el.po | 127 +++-- lib/libalpm/po/en_GB.po | 126 +++-- lib/libalpm/po/eo.po | 116 ++-- lib/libalpm/po/es.po | 131 ++--- lib/libalpm/po/es_419.po | 117 ++-- lib/libalpm/po/eu.po | 116 ++-- lib/libalpm/po/eu_ES.po | 116 ++-- lib/libalpm/po/fi.po | 116 ++-- lib/libalpm/po/fr.po | 129 ++--- lib/libalpm/po/gl.po | 120 +++-- lib/libalpm/po/hr.po | 118 ++-- lib/libalpm/po/hu.po | 116 ++-- lib/libalpm/po/id.po | 117 ++-- lib/libalpm/po/it.po | 128 ++--- lib/libalpm/po/ja.po | 127 +++-- lib/libalpm/po/kk.po | 116 ++-- lib/libalpm/po/ko.po | 131 ++--- lib/libalpm/po/libalpm.pot | 104 ++-- lib/libalpm/po/lt.po | 128 ++--- lib/libalpm/po/nb.po | 130 ++--- lib/libalpm/po/nl.po | 167 +++--- lib/libalpm/po/pl.po | 130 ++--- lib/libalpm/po/pt.po | 118 ++-- lib/libalpm/po/pt_BR.po | 156 +++--- lib/libalpm/po/ro.po | 116 ++-- lib/libalpm/po/ru.po | 123 +++-- lib/libalpm/po/sk.po | 116 ++-- lib/libalpm/po/sl.po | 119 +++-- lib/libalpm/po/sr.po | 124 +++-- lib/libalpm/po/sr(a)latin.po | 124 +++-- lib/libalpm/po/sv.po | 121 +++-- lib/libalpm/po/tr.po | 126 +++-- lib/libalpm/po/uk.po | 128 ++--- lib/libalpm/po/zh_CN.po | 127 +++-- lib/libalpm/po/zh_TW.po | 127 +++-- scripts/po/LINGUAS | 1 + scripts/po/bg.po | 510 ++++++------------ scripts/po/br.po | 479 ++++++----------- scripts/po/ca.po | 887 ++++++++++++------------------- scripts/po/cs.po | 497 ++++++----------- scripts/po/da.po | 523 ++++++------------ scripts/po/de.po | 502 ++++++----------- scripts/po/el.po | 513 ++++++------------ scripts/po/en_GB.po | 505 ++++++------------ scripts/po/eo.po | 475 ++++++----------- scripts/po/es.po | 534 ++++++------------- scripts/po/es_419.po | 482 ++++++----------- scripts/po/eu.po | 477 ++++++----------- scripts/po/eu_ES.po | 477 ++++++----------- scripts/po/fi.po | 449 ++++++---------- scripts/po/fr.po | 537 ++++++------------- scripts/po/gl.po | 485 ++++++----------- scripts/po/hu.po | 473 ++++++---------- scripts/po/id.po | 477 ++++++----------- scripts/po/it.po | 518 ++++++------------ scripts/po/ja.po | 511 ++++++------------ scripts/po/ko.po | 512 ++++++------------ scripts/po/lt.po | 528 ++++++------------ scripts/po/nb.po | 517 ++++++------------ scripts/po/nl.po | 525 ++++++------------ scripts/po/pacman-scripts.pot | 302 +++++------ scripts/po/pl.po | 516 ++++++------------ scripts/po/pt.po | 501 ++++++----------- scripts/po/pt_BR.po | 597 +++++++-------------- scripts/po/ro.po | 472 ++++++---------- scripts/po/ru.po | 500 ++++++----------- scripts/po/sk.po | 481 ++++++----------- scripts/po/{pacman-scripts.pot => sl.po} | 627 +++++++++++----------- scripts/po/sr.po | 506 ++++++------------ scripts/po/sr(a)latin.po | 507 ++++++------------ scripts/po/sv.po | 506 +++++++----------- scripts/po/tr.po | 505 ++++++------------ scripts/po/uk.po | 509 ++++++------------ scripts/po/zh_CN.po | 495 ++++++----------- scripts/po/zh_TW.po | 500 ++++++----------- src/pacman/po/ar.po | 182 +++++-- src/pacman/po/ast.po | 178 ++++++- src/pacman/po/bg.po | 191 +++++-- src/pacman/po/br.po | 192 +++++-- src/pacman/po/ca.po | 556 +++++++++++-------- src/pacman/po/cs.po | 193 +++++-- src/pacman/po/da.po | 194 +++++-- src/pacman/po/de.po | 207 ++++++-- src/pacman/po/el.po | 196 +++++-- src/pacman/po/en_GB.po | 192 +++++-- src/pacman/po/eo.po | 196 +++++-- src/pacman/po/es.po | 201 +++++-- src/pacman/po/es_419.po | 201 +++++-- src/pacman/po/eu.po | 193 +++++-- src/pacman/po/eu_ES.po | 193 +++++-- src/pacman/po/fi.po | 189 +++++-- src/pacman/po/fr.po | 196 +++++-- src/pacman/po/gl.po | 194 +++++-- src/pacman/po/hr.po | 209 ++++++-- src/pacman/po/hu.po | 217 ++++++-- src/pacman/po/id.po | 189 +++++-- src/pacman/po/it.po | 195 +++++-- src/pacman/po/ja.po | 194 +++++-- src/pacman/po/kk.po | 180 +++++-- src/pacman/po/ko.po | 196 +++++-- src/pacman/po/lt.po | 195 +++++-- src/pacman/po/nb.po | 196 +++++-- src/pacman/po/nl.po | 196 +++++-- src/pacman/po/pacman.pot | 169 +++++- src/pacman/po/pl.po | 206 +++++-- src/pacman/po/pt.po | 195 +++++-- src/pacman/po/pt_BR.po | 259 ++++++--- src/pacman/po/ro.po | 192 +++++-- src/pacman/po/ru.po | 192 +++++-- src/pacman/po/sk.po | 193 +++++-- src/pacman/po/sl.po | 184 +++++-- src/pacman/po/sr.po | 191 +++++-- src/pacman/po/sr(a)latin.po | 191 +++++-- src/pacman/po/sv.po | 203 +++++-- src/pacman/po/tr.po | 198 +++++-- src/pacman/po/uk.po | 195 +++++-- src/pacman/po/zh_CN.po | 194 +++++-- src/pacman/po/zh_TW.po | 192 +++++-- 126 files changed, 16598 insertions(+), 17781 deletions(-) copy scripts/po/{pacman-scripts.pot => sl.po} (69%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-225-g7e79cf73
by Allan McRae 07 Oct '19

07 Oct '19

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 7e79cf73fac6fdd7d6cbfb35fe240b137e81c028 (commit) via 095d6332bea6cd44e012927043a89210b1a3f9b3 (commit) via 8e7d425627c8a6ce102c349020ccf6c5786c7a46 (commit) via e581068c77baa7a167662b0c63730dc87cc90b81 (commit) from 8f89e509d2f3d369cb5adb30dd85713ff1c5305c (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 7e79cf73fac6fdd7d6cbfb35fe240b137e81c028 Author: Alad Wenter <alad(a)archlinux.org> Date: Sun Jan 20 23:14:14 2019 +0100 makepkg: propagate E_REMOVE_BUILD_DEPS remove_deps is called once, at the end of clean_up() before makepkg exit. If remove_deps returns >0 (e.g. when pressing "n" in the resulting prompt), the error is caught by the ERR signal handler. This in turns sends SIGUSR1 to the process group, with resulting exit code 138. In case remove_deps fails, this patch exits makepkg with E_REMOVE_DEPS if there was no previous error (that is, EXIT_CODE equals E_OK). Otherwise, makepkg exits with EXIT_CODE. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 095d6332bea6cd44e012927043a89210b1a3f9b3 Author: Erich Eckner <git(a)eckner.net> Date: Thu Sep 12 15:22:03 2019 +0200 makepkg: remove makedepends before installing built package When running `makepkg -i` it may be necessary to first remove make- and checkdepends before installing the built package - for example if they conflict each other. This is the case for wireguard-arch which makedepends and conflicts wireguard-dkms. Signed-off-by: Erich Eckner <git(a)eckner.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8e7d425627c8a6ce102c349020ccf6c5786c7a46 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 7 16:22:52 2019 +1000 makepkg: wait for process to finish Without the -f option to wait, we might move on and try to delete the logpipe before the process is completed. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e581068c77baa7a167662b0c63730dc87cc90b81 Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Aug 27 16:14:07 2019 +1000 makepkg: Delete logpipe when exiting The logpipe fifo can remain when exiting on a non-error condition such as recieving signals INT and USR1. This can be seen by doing either a manual CTRL-C to interrupt the build or by sending a signal such as: $ makepkg & sleep 5 ; kill -USR1 $! Remove the fifo in all cases on script exit if it still exists. Signed-off-by: Austin Lund <austin.lund(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: propagate E_REMOVE_BUILD_DEPS
by Alad Wenter 07 Oct '19

07 Oct '19

remove_deps is called once, at the end of clean_up() before makepkg exit. If remove_deps returns >0 (e.g. when pressing "n" in the resulting prompt), the error is caught by the ERR signal handler. This in turns sends SIGUSR1 to the process group, with resulting exit code 138. In case remove_deps fails, this patch exits makepkg with E_REMOVE_DEPS if there was no previous error (that is, EXIT_CODE equals E_OK). Otherwise, makepkg exits with EXIT_CODE. --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c81dc801..fd459532 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -176,7 +176,11 @@ clean_up() { fi fi - remove_deps + if ! remove_deps && (( EXIT_CODE == E_OK )); then + exit $E_REMOVE_DEPS_FAILED + else + exit $EXIT_CODE + fi } enter_fakeroot() { -- 2.20.1

2 1

[pacman-dev] [pacman] [PATCH] makepkg: remove makedepends before installing built package
by arch＠eckner.net 07 Oct '19

07 Oct '19

From: Erich Eckner <git(a)eckner.net> When running `makepkg -i` it may be necessary to first remove make- and checkdepends before installing the built package - for example if they conflict each other. This is the case for wireguard-arch which makedepends and conflicts wireguard-dkms. Signed-off-by: Erich Eckner <git(a)eckner.net> --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43484db3..25d97287 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -821,6 +821,9 @@ create_srcpackage() { install_package() { (( ! INSTALL )) && return 0 + remove_deps || return $? + RMDEPS=0 + if (( ! SPLITPKG )); then msg "$(gettext "Installing package %s with %s...")" "$pkgname" "$PACMAN -U" else -- 2.23.0

4 4

[pacman-dev] [PATCH] makepkg: wait for process to finish
by Allan McRae 07 Oct '19

07 Oct '19

Without the -f option to wait, we might move on and try to delete the logpipe before the process is completed. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a follow-up to the logpipe discussion. Hopefully this prevents the need for rm -f on $logpipe, but we will have to wait and see if that issue is still around. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fac268a8..ec2de455 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -428,7 +428,7 @@ run_function() { $pkgfunc &>"$logpipe" - wait $teepid + wait -f $teepid rm "$logpipe" else "$pkgfunc" -- 2.23.0

1 0

[pacman-dev] [PATCH] makepkg: Only change debug prefix if making debug package
by Austin Lund 07 Oct '19

07 Oct '19

Currently all debug builds will prefix /usr/src/build to the source paths. If debugging symbols are stripped into a separate package then these sources files are indeed in this path. But if the debug build is not stripped then one is left with a complex path rewriting to perform debugging. It's much easier to perform sensible path rewriting in this instance when the path is left untouched. Signed-off-by: Austin Lund <austin.lund(a)gmail.com> --- scripts/libmakepkg/buildenv/debugflags.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index ce9c1556..ff715803 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,8 +30,10 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + if check_option "strip" "y"; then + DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + fi CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" fi -- 2.22.0

3 6

[pacman-dev] [PATCH] pacman: new config to highlight testing packages
by Matthew Sexton 07 Oct '19

07 Oct '19

Only during Install/Upgrade, and not to verbosepkglist Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- src/pacman/conf.c | 2 ++ src/pacman/conf.h | 2 ++ src/pacman/pacman-conf.c | 1 + src/pacman/util.c | 20 ++++++++++++++++---- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2d8518c4..70c8a4f4 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -494,6 +494,8 @@ static int _parse_options(const char *key, char *value, config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; enable_colors(config->color); } + } else if(strcmp(key, "HighlightTesting") == 0) { + config->highlighttesting = 1; } else if(strcmp(key, "DisableDownloadTimeout") == 0) { config->disable_dl_timeout = 1; } else { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f45ed436..51fa5764 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -117,6 +117,8 @@ typedef struct __config_t { unsigned short totaldownload; /* select -Sc behavior */ unsigned short cleanmethod; + /* Highlight packages from testing repositories */ + unsigned short highlighttesting; alpm_list_t *holdpkg; alpm_list_t *ignorepkg; alpm_list_t *ignoregrp; diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index df874029..1e40c138 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -260,6 +260,7 @@ static void dump_config(void) show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); + show_bool("HighlightTesting", config->highlighttesting); show_cleanmethod("CleanMethod", config->cleanmethod); diff --git a/src/pacman/util.c b/src/pacman/util.c index 8f6290db..13ac0f25 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -898,15 +898,27 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* form data for both verbose and non-verbose display */ for(i = targets; i; i = alpm_list_next(i)) { + unsigned short testing = 0; + const char *repo; pm_target_t *target = i->data; - + alpm_db_t *db = alpm_pkg_get_db(target->install); + if(db) { + repo = alpm_db_get_name(db); + if (strcmp(repo, "testing") == 0 || strcmp(repo,"community-testing") == 0) { + testing = 1; + } + } if(verbose) { rows = alpm_list_add(rows, create_verbose_row(target)); } - if(target->install) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), - alpm_pkg_get_version(target->install)); + if (testing && config->highlighttesting) { + pm_asprintf(&str, "%s%s-%s%s", config->color == PM_COLOR_ON ? config->colstr.warn : "**", + alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install), + config->color == PM_COLOR_ON ? config->colstr.nocolor : "**"); + } else { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); + } } else if(isize == 0) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); -- 2.23.0

5 6