pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=442
This commit is contained in:
Michael Schröder 2018-02-14 12:11:32 +00:00 committed by Git OBS Bridge
parent cd3cd0fd3b
commit e4f80724ec
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hardlinks.diff
View File

@ -52,15 +52,17 @@
} }
/** /**
@@ -491,6 +502,7 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx @@ -506,6 +517,9 @@ static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfi
static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfiles fi) rpmfileAttrs FFlags;
{ struct rpmffi_s * recs;
rpm_loff_t fixupSize = 0; int numRecs;
+ rpm_loff_t fileSize = 0; + rpm_loff_t fileSize;
int i, j; + int nlink;
rpmfs fs = rpmteGetFileStates(p); + const int *links;
rpmfs otherFs;
@@ -628,7 +640,8 @@ assert(otherFi != NULL); if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
continue;
@@ -628,7 +642,8 @@ assert(otherFi != NULL);
break; break;
/* Try to get the disk accounting correct even if a conflict. */ /* Try to get the disk accounting correct even if a conflict. */
@ -70,7 +72,7 @@
if (rpmfilesConfigConflict(fi, i)) { if (rpmfilesConfigConflict(fi, i)) {
/* Here is an overlapped pre-existing config file. */ /* Here is an overlapped pre-existing config file. */
@@ -675,9 +688,16 @@ assert(otherFi != NULL); @@ -675,9 +690,16 @@ assert(otherFi != NULL);
} }
rpmfilesFree(otherFi); rpmfilesFree(otherFi);