- Since the only thing where globs are not permitted are %dev entires,
check for device explicitcly in the glob part. Doh.
int processingFailed;
- int noGlob;
unsigned devtype;
unsigned devmajor;
int devminor;
goto exit;
}
- fl->noGlob = 1;
-
rc = RPMRC_OK;
exit:
int argc = 0;
int i;
- /* XXX for %dev marker in file manifest only */
- if (fl->noGlob) {
- rpmlog(RPMLOG_ERR, _("Glob not permitted: %s\n"), diskPath);
+ if (fl->devtype) {
+ rpmlog(RPMLOG_ERR, _("%%dev glob not permitted: %s\n"), diskPath);
rc = RPMRC_FAIL;
goto exit;
}
fl.currentFlags = 0;
fl.currentVerifyFlags = 0;
- fl.noGlob = 0;
fl.devtype = 0;
fl.devmajor = 0;
fl.devminor = 0;
fl.currentSpecdFlags = ((unsigned)fl.defSpecdFlags) >> 8;
fl.currentVerifyFlags = fl.defVerifyFlags;
- fl.noGlob = 0;
fl.devtype = 0;
fl.devmajor = 0;
fl.devminor = 0;
fl.currentFlags = 0;
fl.currentVerifyFlags = fl.defVerifyFlags;
- fl.noGlob = 0;
fl.devtype = 0;
fl.devmajor = 0;
fl.devminor = 0;