From owner-svn-src-all@freebsd.org  Mon May  8 20:44:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7ACE3D63443;
 Mon,  8 May 2017 20:44:22 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 348191AF3;
 Mon,  8 May 2017 20:44:22 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v48KiL42045043;
 Mon, 8 May 2017 20:44:21 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v48KiLw3045042;
 Mon, 8 May 2017 20:44:21 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201705082044.v48KiLw3045042@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 8 May 2017 20:44:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317980 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 May 2017 20:44:22 -0000

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