[oe-commits] [bitbake] branch master updated: fetch: Fix use of tar's --exclude option for tar >= 1.29

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

The following commit(s) were added to refs/heads/master by this push:
       new  cc71d5d   fetch: Fix use of tar's --exclude option for tar >= 1.29
cc71d5d is described below

commit cc71d5d9da71ea5f21d02f3b2fbf119bd2d794f0
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Fri Aug 5 13:54:44 2016 +0000

    fetch: Fix use of tar's --exclude option for tar >= 1.29
    
    Starting from tar 1.29 the --exclude option won't work
    anymore if is not used before the path. There are some
    fetch modules that copy the ptest using tar and --exclude
    option. This fixes these for bitbake.
    
    [YOCTO #9763]
    
    Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/bzr.py  | 2 +-
 lib/bb/fetch2/cvs.py  | 2 +-
 lib/bb/fetch2/repo.py | 2 +-
 lib/bb/fetch2/svn.py  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/bb/fetch2/bzr.py b/lib/bb/fetch2/bzr.py
index 03e9ac4..ce11ee7 100644
--- a/lib/bb/fetch2/bzr.py
+++ b/lib/bb/fetch2/bzr.py
@@ -106,7 +106,7 @@ class Bzr(FetchMethod):
         if scmdata == "keep":
             tar_flags = ""
         else:
-            tar_flags = "--exclude '.bzr' --exclude '.bzrtags'"
+            tar_flags = "--exclude='.bzr' --exclude='.bzrtags'"
 
         # tar them up to a defined filename
         runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath])
diff --git a/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py
index d27d96f..43a234f 100644
--- a/lib/bb/fetch2/cvs.py
+++ b/lib/bb/fetch2/cvs.py
@@ -147,7 +147,7 @@ class Cvs(FetchMethod):
         if scmdata == "keep":
             tar_flags = ""
         else:
-            tar_flags = "--exclude 'CVS'"
+            tar_flags = "--exclude='CVS'"
 
         # tar them up to a defined filename
         if 'fullpath' in ud.parm:
diff --git a/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py
index 21678eb..fd64b7e 100644
--- a/lib/bb/fetch2/repo.py
+++ b/lib/bb/fetch2/repo.py
@@ -83,7 +83,7 @@ class Repo(FetchMethod):
         if scmdata == "keep":
             tar_flags = ""
         else:
-            tar_flags = "--exclude '.repo' --exclude '.git'"
+            tar_flags = "--exclude='.repo' --exclude='.git'"
 
         # Create a cache
         runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d)
diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py
index 8a29193..968ca79 100644
--- a/lib/bb/fetch2/svn.py
+++ b/lib/bb/fetch2/svn.py
@@ -150,7 +150,7 @@ class Svn(FetchMethod):
         if scmdata == "keep":
             tar_flags = ""
         else:
-            tar_flags = "--exclude '.svn'"
+            tar_flags = "--exclude='.svn'"
 
         os.chdir(ud.pkgdir)
         # tar them up to a defined filename

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.