Blame rpm-4.7.0-beta1-installangs.patch
|
Panu Matilainen |
e15b00 |
commit cdcbd324fe41cd729434576200593c0fbda44a19
|
|
Panu Matilainen |
e15b00 |
Author: Panu Matilainen <pmatilai@redhat.com>
|
|
Panu Matilainen |
e15b00 |
Date: Mon Mar 9 14:57:46 2009 +0200
|
|
Panu Matilainen |
e15b00 |
|
|
Panu Matilainen |
e15b00 |
Unbreak %_install_langs handling (rhbz#489235)
|
|
Panu Matilainen |
e15b00 |
- using rpmfiFLangs() in skipFiles() broke the %_install_langs logic,
|
|
Panu Matilainen |
e15b00 |
causing all files to be skipped if install langs, eek
|
|
Panu Matilainen |
e15b00 |
|
|
Panu Matilainen |
e15b00 |
diff --git a/lib/transaction.c b/lib/transaction.c
|
|
Panu Matilainen |
e15b00 |
index 2940634..25a147a 100644
|
|
Panu Matilainen |
e15b00 |
--- a/lib/transaction.c
|
|
Panu Matilainen |
e15b00 |
+++ b/lib/transaction.c
|
|
Panu Matilainen |
e15b00 |
@@ -488,7 +488,8 @@ static void skipFiles(const rpmts ts, rpmte p)
|
|
Panu Matilainen |
e15b00 |
/*
|
|
Panu Matilainen |
e15b00 |
* Skip i18n language specific files.
|
|
Panu Matilainen |
e15b00 |
*/
|
|
Panu Matilainen |
e15b00 |
- if (ts->installLangs != NULL && (flangs = rpmfiFLangs(fi)) != NULL) {
|
|
Panu Matilainen |
e15b00 |
+ flangs = (ts->installLangs != NULL) ? rpmfiFLangs(fi) : NULL;
|
|
Panu Matilainen |
e15b00 |
+ if (flangs != NULL && *flangs != '\0') {
|
|
Panu Matilainen |
e15b00 |
const char *l, *le;
|
|
Panu Matilainen |
e15b00 |
char **lang;
|
|
Panu Matilainen |
e15b00 |
for (lang = ts->installLangs; *lang != NULL; lang++) {
|