Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 May 2017 20:44:21 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r317980 - head/share/mk
Message-ID:  <201705082044.v48KiLw3045042@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Mon May  8 20:44:21 2017
New Revision: 317980
URL: https://svnweb.freebsd.org/changeset/base/317980

Log:
  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

Modified:
  head/share/mk/meta2deps.py

Modified: head/share/mk/meta2deps.py
==============================================================================
--- head/share/mk/meta2deps.py	Mon May  8 20:44:12 2017	(r317979)
+++ head/share/mk/meta2deps.py	Mon May  8 20:44:21 2017	(r317980)
@@ -143,7 +143,7 @@ def sort_unique(list, cmp=None, key=None
     for e in list:
         if e == le:
             continue
-	le = e
+        le = e
         nl.append(e)
     return nl
 
@@ -535,7 +535,7 @@ class MetaFile:
         # 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705082044.v48KiLw3045042>