From 7ba2a13164c5da810ccc34ee0774dc9485f25a1c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 9 Mar 2009 14:57:46 +0200 Subject: Unbreak %_install_langs handling (rhbz#489235) - using rpmfiFLangs() in skipFiles() broke the %_install_langs logic, causing all files to be skipped if install langs, eek (cherry picked from commit cdcbd324fe41cd729434576200593c0fbda44a19) --- lib/transaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/transaction.c b/lib/transaction.c index 2940634bc..25a147a2f 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -488,7 +488,8 @@ static void skipFiles(const rpmts ts, rpmte p) /* * Skip i18n language specific files. */ - if (ts->installLangs != NULL && (flangs = rpmfiFLangs(fi)) != NULL) { + flangs = (ts->installLangs != NULL) ? rpmfiFLangs(fi) : NULL; + if (flangs != NULL && *flangs != '\0') { const char *l, *le; char **lang; for (lang = ts->installLangs; *lang != NULL; lang++) { -- cgit v1.2.3