1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-03 09:00:21 +00:00

Fix syntax error in parse_path after r316952.

Also fix bad whitespace in sort_unique after r314809.

The parse_path syntax error came up in DIRDEPS_BUILD as the following
and emptied out all Makefile.depend files due to it:

	# python share/mk/meta2deps.py
	  File "share/mk/meta2deps.py", line 538
	    rdir = os.path.realpath(dir)
	    ^
	IndentationError: unexpected indent

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-05-08 20:44:21 +00:00
parent 57a21383e2
commit fbbb9824a3
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=317980

View File

@ -143,7 +143,7 @@ def sort_unique(list, cmp=None, key=None, reverse=False):
for e in list:
if e == le:
continue
le = e
le = e
nl.append(e)
return nl
@ -535,7 +535,7 @@ def parse_path(self, path, cwd, op=None, w=[]):
# to the src dir, we may need to add dependencies for each
rdir = dir
dir = abspath(dir, cwd, self.last_dir, self.debug, self.debug_out)
rdir = os.path.realpath(dir)
rdir = os.path.realpath(dir)
if rdir == dir:
rdir = None
# now put path back together