From 8fe174e395a583b55fc54bd455fb88bec19f7e45 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Apr 1997 15:33:08 +0000 Subject: [PATCH] strip trailing slahes from file names don't set config flag on directories CVS patchset: 1541 CVS date: 1997/04/15 15:33:08 --- build/files.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/files.c b/build/files.c index 2ef7836..0e7067b 100644 --- a/build/files.c +++ b/build/files.c @@ -397,6 +397,10 @@ int process_filelist(Header header, struct PackageRec *pr, while (c < count) { fest = file_entry_array[c]; if (type == RPMLEAD_BINARY) { + x = strlen(fest->file) - 1; + if (x && fest->file[x] == '/') { + fest->file[x] = '\0'; + } fileList[c] = fest->file; } else { fileList[c] = strrchr(fest->file, '/') + 1; @@ -440,7 +444,7 @@ int process_filelist(Header header, struct PackageRec *pr, fileFlagsList[c] |= RPMFILE_DOC; if (fest->isdoc) fileFlagsList[c] |= RPMFILE_DOC; - if (fest->conf) + if (fest->conf && !(fest->statbuf.st_mode & S_IFDIR)) fileFlagsList[c] |= fest->conf; if (fest->isspecfile) fileFlagsList[c] |= RPMFILE_SPECFILE; -- 2.7.4