Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Jason Plum <jplum@devonit.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [Patch v2] lib/oe: copyhardlinktree - detect mount points
Date: Fri, 17 Jan 2014 10:45:35 -0500	[thread overview]
Message-ID: <1389973536-9479-1-git-send-email-jplum@devonit.com> (raw)


    lib/oe: copyhardlinktree - detect mount points
    Add function getmount to detect the mount point of the path, as
    os.stat(path).st_dev in copyhardlinktree fails in lxc containers
    to detect different paths as separate mounted filesystems
    (cp -l failure)

    Signed-off-by: Jason Plum <jplum@devonit.com>

diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 1310e38..f1905c3 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 tw
         # writers try and create a directory at the same time
         cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from -
@@ -259,3 +259,12 @@ def realpath(file, root, use_physdir = True, loop_cnt = 100,
         raise

     return file
+
+def getmount(path):
+    """ Returns the mount point of the path, using realpath """
+    path = realpath(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



                 reply	other threads:[~2014-01-17 15:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389973536-9479-1-git-send-email-jplum@devonit.com \
    --to=jplum@devonit.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox