summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-03-02 01:31:01 +0000
committerjbj <devnull@localhost>2004-03-02 01:31:01 +0000
commit5ef0bf77c22339195fc0b746e8b4dfe03020d360 (patch)
tree1a7b5a4c88f6ca828c7094d67ddaede4d02a6d6a /build
parentf3cd4db8ea843f622d4ff887c41af0d00ae3cef4 (diff)
downloadlibrpm-tizen-5ef0bf77c22339195fc0b746e8b4dfe03020d360.tar.gz
librpm-tizen-5ef0bf77c22339195fc0b746e8b4dfe03020d360.tar.bz2
librpm-tizen-5ef0bf77c22339195fc0b746e8b4dfe03020d360.zip
- permit globs in macrofiles: directive (#117217).
CVS patchset: 7139 CVS date: 2004/03/02 01:31:01
Diffstat (limited to 'build')
-rw-r--r--build/files.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/files.c b/build/files.c
index 70bd75232..11b95041b 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1829,11 +1829,12 @@ static int processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
fl->totalFileSize, fl->fileCount,
rpmGlobalMacroContext, fileSystem, internalState @*/
{
+ int quote = 1; /* XXX permit quoted glob characters. */
int doGlob;
const char *diskURL = NULL;
int rc = 0;
- doGlob = myGlobPatternP(fileURL);
+ doGlob = Glob_pattern_p(fileURL, quote);
/* Check that file starts with leading "/" */
{ const char * fileName;
@@ -1871,7 +1872,7 @@ static int processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
/*@-branchstate@*/
rc = rpmGlob(diskURL, &argc, &argv);
- if (rc == 0 && argc >= 1 && !myGlobPatternP(argv[0])) {
+ if (rc == 0 && argc >= 1 && !Glob_pattern_p(argv[0], quote)) {
for (i = 0; i < argc; i++) {
rc = addFile(fl, argv[i], NULL);
/*@-boundswrite@*/