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

fixed relocated/excluded paths 

CVS patchset: 2822
CVS date: 1999/02/21 04:01:12
This commit is contained in:
ewt 1999-02-21 04:01:12 +00:00
parent 4db26fd478
commit 12b921284d
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/transaction.c
View File

@ -468,7 +468,7 @@ static Header relocateFileList(struct availablePackage * alp,
char ** validRelocations, ** actualRelocations;
char ** names;
char ** origNames;
int len, newLen;
int len;
char * newName;
int_32 fileCount;
Header h;
@ -559,28 +559,20 @@ static Header relocateFileList(struct availablePackage * alp,
/* go through things backwards so that /usr/local relocations take
precedence over /usr ones */
nextReloc = relocations + numRelocations - 1;
len = strlen(nextReloc->oldPath);
newLen = nextReloc->newPath ? strlen(nextReloc->newPath) : 0;
for (i = fileCount - 1; i >= 0 && nextReloc; i--) {
do {
rc = (!strncmp(nextReloc->oldPath, names[i], len) &&
(names[i][len] == '/'));
if (!rc) {
if (nextReloc == relocations) {
nextReloc = 0;
} else {
nextReloc--;
len = strlen(nextReloc->oldPath);
newLen = nextReloc->newPath ?
strlen(nextReloc->newPath) : 0;
}
}
} while (!rc && nextReloc);
for (i = fileCount - 1; i >= 0; i--) {
for (j = numRelocations - 1; j >= 0; j--) {
nextReloc = relocations + j;
len = strlen(relocations[j].oldPath);
rc = (!strncmp(relocations[j].oldPath, names[i], len) &&
((names[i][len] == '/') || !names[i][len]));
if (rc) break;
}
if (rc) {
if (j >= 0) {
nextReloc = relocations + j;
if (nextReloc->newPath) {
newName = alloca(newLen + strlen(names[i]) + 1);
newName = alloca(strlen(nextReloc->newPath) +
strlen(names[i]) + 1);
strcpy(newName, nextReloc->newPath);
strcat(newName, names[i] + len);
rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),