From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.devonhealth.com (unknown [8.20.30.154]) by mail.openembedded.org (Postfix) with ESMTP id 808DE6E811 for ; Fri, 24 Jan 2014 14:05:33 +0000 (UTC) Received: from emfserver.devonintlgroup.com (10.0.7.48) by mx1.devonhealth.com (10.0.20.154) with Microsoft SMTP Server id 8.3.327.1; Fri, 24 Jan 2014 09:05:14 -0500 Received: from [10.0.2.7] by emfserver.devonintlgroup.com over TLS secured channel with ESMTP (Devon Health Services, Inc Email Firewall SMTP Relay (Email Firewall v6.5)); Fri, 24 Jan 2014 09:05:28 -0500 X-Server-Uuid: 6CB55748-6642-4D3C-9211-397BC4E7A815 Received: from [10.0.15.96] (10.0.15.96) by boddingtons.devonintlgroup.com (10.0.2.15) with Microsoft SMTP Server ( TLS) id 8.3.327.1; Fri, 24 Jan 2014 09:05:28 -0500 Message-ID: <52E27327.2000703@devonit.com> Date: Fri, 24 Jan 2014 09:05:27 -0500 From: Jason Plum User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: References: <1390245778-9252-1-git-send-email-jplum@devonit.com> In-Reply-To: <1390245778-9252-1-git-send-email-jplum@devonit.com> X-Forwarded-Message-Id: <1390245778-9252-1-git-send-email-jplum@devonit.com> X-WSS-ID: 7EFCACA22B8418899-01-01 Subject: [PATCH v3] meta/oe/lib/path.py - check mount points, not device X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2014 14:05:33 -0000 Content-Type: text/plain; charset="iso-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Signed-off-by: Jason Plum --- meta/lib/oe/path.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 46783f8..dab20fc 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -90,7 +90,7 @@ def copyhardlinktree(src, dst): if os.path.isdir(src) and not len(os.listdir(src)): return - if (os.stat(src).st_dev == os.stat(dst).st_dev): + if (getmount(src) == getmount(dst)): # Need to copy directories only with tar first since cp will error if two # writers try and create a directory at the same time cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - --no-recursion | tar -xf - -C %s' % (src, src, dst) @@ -257,3 +257,14 @@ def realpath(file, root, use_physdir = True, loop_cnt = 100, assume_dir = False) raise return file + +def getmount(path): + """ getmount takes a path parameter, uses os.path.realpath with os.path.abspath to + handle symlink resolution, and returns the path to the mount point of the input path + """ + path = os.path.realpath(os.path.abspath(path)) + while path != os.path.sep: + if os.path.ismount(path): + return path + path = os.path.abspath(os.path.join(path, os.pardir)) + return path \ No newline at end of file -- 1.8.5.3