From 60944b3599dc50996642a6b4bc2c4d80d5e6bb4af998caeabde6c07bcb523316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 21 Jul 2011 11:01:35 +0000 Subject: [PATCH] - fix problem with trailings slashes and recursive file adding OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=135 --- rpm.changes | 5 +++++ trailslash.diff | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rpm.changes b/rpm.changes index 7443608..e428882 100644 --- a/rpm.changes +++ b/rpm.changes @@ -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 diff --git a/trailslash.diff b/trailslash.diff index 58abbd6..875df7b 100644 --- a/trailslash.diff +++ b/trailslash.diff @@ -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 */