From cbaab65ff4bb3e4fc77066032a8858f4d5d61241 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 30 Sep 2008 16:54:37 +0000 Subject: Merge changes from Poky bitbake 1.8 Update bitbake-dev to have extra fixes from Poky's internal (1.8) version of bitbake. Should be able to use bitbake-dev with Poky now. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5340 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake-dev/lib/bb/fetch/git.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'bitbake-dev/lib/bb/fetch/git.py') diff --git a/bitbake-dev/lib/bb/fetch/git.py b/bitbake-dev/lib/bb/fetch/git.py index f4ae724f8..aa26a500c 100644 --- a/bitbake-dev/lib/bb/fetch/git.py +++ b/bitbake-dev/lib/bb/fetch/git.py @@ -27,15 +27,6 @@ from bb.fetch import Fetch from bb.fetch import FetchError from bb.fetch import runfetchcmd -def prunedir(topdir): - # Delete everything reachable from the directory named in 'topdir'. - # CAUTION: This is dangerous! - for root, dirs, files in os.walk(topdir, topdown=False): - for name in files: - os.remove(os.path.join(root, name)) - for name in dirs: - os.rmdir(os.path.join(root, name)) - class Git(Fetch): """Class to fetch a module or modules from git repositories""" def supports(self, url, ud, d): @@ -107,7 +98,7 @@ class Git(Fetch): runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d) if os.path.exists(codir): - prunedir(codir) + bb.utils.prunedir(codir) bb.mkdirhier(codir) os.chdir(repodir) @@ -119,7 +110,7 @@ class Git(Fetch): runfetchcmd("tar -czf %s %s" % (ud.localpath, os.path.join(".", "*") ), d) os.chdir(repodir) - prunedir(codir) + bb.utils.prunedir(codir) def suppports_srcrev(self): return True -- cgit v1.2.3