folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check LINGUAS when installing i18n files 

CVS patchset: 2043
CVS date: 1998/03/23 16:34:38
This commit is contained in:
ewt 1998-03-23 16:34:38 +00:00
parent c456ea27e5
commit fb1398490e
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -1,6 +1,8 @@
2.4.104 -> 2.4.105:
- added langpath: to rpmrc, and mark files with matches
- added some C++ cruft to rpmlib header files
- added langpatt: to rpmrc, and mark files with matches
- added some C++ cruft to rpmlib.h
- added find-requires and find-provides for hpux (Tim Mooney)
- respect LINGUAS when install package files
- added trigger support to build code
- got rid of annoying mwftw() type warning

21
lib/install.c
View File

@ -161,9 +161,11 @@ static int assembleFileList(Header h, struct fileMemory * mem,
struct rpmRelocation tmpReloc;
struct rpmRelocation * nextReloc;
char ** validRelocations = NULL, ** actualRelocations;
char * newName;
char ** fileLangs;
char * newName, * chptr;
int rc;
int numValid;
char ** languages, ** lang;
if (rawRelocations) {
if (!headerGetEntry(h, RPMTAG_PREFIXES, NULL,
@ -313,6 +315,13 @@ static int assembleFileList(Header h, struct fileMemory * mem,
headerGetEntry(h, RPMTAG_FILEMODES, NULL, (void **) &fileModes, NULL);
headerGetEntry(h, RPMTAG_FILESIZES, NULL, (void **) &fileSizes, NULL);
headerGetEntry(h, RPMTAG_FILELINKTOS, NULL, (void **) &mem->links, NULL);
languages = NULL;
headerGetEntry(h, RPMTAG_FILELANGS, NULL, (void **) &fileLangs, NULL);
if ((chptr = getenv("LINGUAS"))) {
languages = splitString(chptr, strlen(chptr), ':');
} else
languages = NULL;
for (i = 0, file = files; i < fileCount; i++, file++) {
file->state = RPMFILE_STATE_NORMAL;
@ -326,6 +335,16 @@ static int assembleFileList(Header h, struct fileMemory * mem,
file->link = mem->links[i];
file->size = fileSizes[i];
file->flags = fileFlags[i];
if (fileLangs && languages && *fileLangs[i]) {
for (lang = languages; *lang; lang++)
if (!strcmp(*lang, fileLangs[i])) break;
if (!*lang) {
file->install = 0;
rpmMessage(RPMMESS_DEBUG, "not installing %s -- linguas\n",
file->relativePath);
}
}
}
return 0;