os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

checkupdate: Losen a bit the %SOURCE% path validation check.

Browse source 
It's to return a pathname that doesn't exist, so if it contains a
'/' character it's probably a valid path with a small typo.  Let
the rest of the script handle its non-existence, which it already
does fine.
This commit is contained in:
Giorgos Keramidas 2008-06-15 17:12:47 +00:00
parent 7477abce2e
commit 22b14be34f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=32284
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py
View file

@ -173,10 +173,10 @@ def freebsdrevision(fname):
rev = nrev rev = nrev
except IOError, inst: except IOError, inst:
if inst.errno == errno.ENOENT: if inst.errno == errno.ENOENT:
warning("%s: cannot open file for reading" % fname) debug(3, "%s: cannot open file for reading" % fname)
return None return None
except Exception, inst: except Exception, inst:
warning("%s: cannot extract revision number: %s" % (fname, str(inst))) debug(3, "%s: cannot extract revision number: %s" % (fname, str(inst)))
return None return None
if not rev: if not rev:
debug(3, "FreeBSD revision not found in file `%s'" % fname) debug(3, "FreeBSD revision not found in file `%s'" % fname)
@ -217,8 +217,10 @@ def fileinfo(fname):
if m: if m:
nsrc = m.group(2) nsrc = m.group(2)
# Validate the `%SOURCE%' path, to avoid false matches with # Validate the `%SOURCE%' path, to avoid false matches with
# `%SOURCE%' tags in comments or documentation. # `%SOURCE%' tags in comments or documentation. This isn't
if nsrc and os.path.exists(nsrc): # exactly a perfect validation check, but it should catch most
# of the common cases.
if nsrc and ('/' in nsrc or os.path.exists(nsrc)):
if src: if src:
warning("multiple %%SOURCE%% tags in file %s" % fname) warning("multiple %%SOURCE%% tags in file %s" % fname)
src = nsrc src = nsrc
@ -259,7 +261,7 @@ def reportfile(fname, frev, srcfile, srcexists, srcid, srcrev):
text = "%s%s" % (fname, frev and " rev. " + str(frev) or "") text = "%s%s" % (fname, frev and " rev. " + str(frev) or "")
revtext = "%-10s -> %-10s" % (srcid or "NO-%SRCID%", srcrev or "NONE") revtext = "%-10s -> %-10s" % (srcid or "NO-%SRCID%", srcrev or "NONE")
if srcfile and not srcexists: if srcfile and not srcexists:
filetext = "%s (DELETED)" % srcfile filetext = "%s (MISSING)" % srcfile
elif srcfile: elif srcfile:
filetext = "%s" % srcfile filetext = "%s" % srcfile
else: else: