diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-03-09 14:57:46 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-03-09 16:03:04 +0200 |
| commit | 7ba2a13164c5da810ccc34ee0774dc9485f25a1c (patch) | |
| tree | 0ced68b0d36f95d44e3cb38314123f6d989e14bc | |
| parent | 32bbab9926df7e2503e418734bf44c94c949b403 (diff) | |
| download | rpm-7ba2a13164c5da810ccc34ee0774dc9485f25a1c.tar.gz rpm-7ba2a13164c5da810ccc34ee0774dc9485f25a1c.tar.bz2 rpm-7ba2a13164c5da810ccc34ee0774dc9485f25a1c.zip | |
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)
| -rw-r--r-- | lib/transaction.c | 3 |
1 files changed, 2 insertions, 1 deletions
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++) { |