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

Fix the erased files last fix. 

CVS patchset: 3226
CVS date: 1999/08/15 13:41:06
This commit is contained in:
jbj 1999-08-15 13:41:06 +00:00
parent f12ab9fac1
commit 721d10da7c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction.c
View File

@ -704,7 +704,7 @@ static void handleOverlappedFiles(struct fileInfo * fi, hashTable ht,
otherFileNum = -1; /* keep gcc quiet */
for (otherPkgNum = j - 1; otherPkgNum >= 0; otherPkgNum--) {
#if XXX_REMOVED_PACKAGES_LAST
#if XXX_ERASED_PACKAGES_LAST
if (recs[otherPkgNum]->type != TR_ADDED)
continue;
#endif
@ -751,10 +751,14 @@ static void handleOverlappedFiles(struct fileInfo * fi, hashTable ht,
break;
case TR_REMOVED:
if (otherPkgNum >= 0) {
#if XXX_REMOVED_PACKAGES_LAST
#if XXX_ERASED_PACKAGES_LAST
fi->actions[i] = FA_SKIP;
break;
#else
if (recs[otherPkgNum]->actions[otherFileNum] != FA_REMOVE) {
fi->actions[i] = FA_SKIP;
break;
}
recs[otherPkgNum]->actions[otherFileNum] = FA_SKIP;
#endif
}

2
po/rpm.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 1999-08-14 15:43-0400\n"
"POT-Creation-Date: 1999-08-15 09:36-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"