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

- fix problem with trailings slashes and recursive file adding

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=135
This commit is contained in:
Michael Schröder 2011-07-21 11:01:35 +00:00 committed by Git OBS Bridge
parent 1176195405
commit 60944b3599
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 21 13:00:47 CEST 2011 - mls@suse.de
- fix problem with trailings slashes and recursive file adding
-------------------------------------------------------------------
Wed Jul 20 13:42:16 CEST 2011 - mls@suse.de

13
trailslash.diff
View File

@ -1,5 +1,14 @@
--- ./build/files.c.orig 2011-07-20 11:37:45.000000000 +0000
+++ ./build/files.c 2011-07-20 11:39:20.000000000 +0000
--- ./build/files.c.orig 2011-07-21 10:59:03.000000000 +0000
+++ ./build/files.c 2011-07-21 10:59:33.000000000 +0000
@@ -1398,7 +1398,7 @@ static rpmRC addFile(FileList fl, const
}
}
- if ((! fl->isDir) && S_ISDIR(statp->st_mode)) {
+ if ((fl->isDir <= 0) && S_ISDIR(statp->st_mode)) {
/* FIX: fl->buildRoot may be NULL */
return recurseDir(fl, diskPath);
}
@@ -1678,9 +1678,6 @@ static rpmRC processBinaryFile(Package p
* /.././../usr/../bin//./sh
*/