summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-16 10:58:57 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-16 10:58:57 +0000
commit58915670609f715451f10d352a439deb70977743 (patch)
tree02f4df2e9328d0841a98b81c2e760553d1e63d28 /bitbake/lib/bb/fetch
parentcc1e39fab24b0eaf4f42eff2cfa2dc1eb8899d34 (diff)
downloadpoky-58915670609f715451f10d352a439deb70977743.tar.gz
CVS fetcher: added "fullpath" option to get full repository paths inside of
checkout archive tarballs. It is very useful when used with "norecurse" option. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3496 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r--bitbake/lib/bb/fetch/cvs.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py
index 755c5983f4..70869d22ad 100644
--- a/bitbake/lib/bb/fetch/cvs.py
+++ b/bitbake/lib/bb/fetch/cvs.py
@@ -62,7 +62,11 @@ class Cvs(Fetch):
62 if 'norecurse' in ud.parm: 62 if 'norecurse' in ud.parm:
63 norecurse = '_norecurse' 63 norecurse = '_norecurse'
64 64
65 ud.localfile = data.expand('%s_%s_%s_%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse), d) 65 fullpath = ''
66 if 'fullpath' in ud.parm:
67 fullpath = '_fullpath'
68
69 ud.localfile = data.expand('%s_%s_%s_%s%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse, fullpath), d)
66 70
67 return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) 71 return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
68 72
@@ -150,10 +154,15 @@ class Cvs(Fetch):
150 pass 154 pass
151 raise FetchError(ud.module) 155 raise FetchError(ud.module)
152 156
153 os.chdir(moddir)
154 os.chdir('..')
155 # tar them up to a defined filename 157 # tar them up to a defined filename
156 myret = os.system("tar -czf %s %s" % (ud.localpath, os.path.basename(moddir))) 158 if 'fullpath' in ud.parm:
159 os.chdir(pkgdir)
160 myret = os.system("tar -czf %s %s" % (ud.localpath, localdir))
161 else:
162 os.chdir(moddir)
163 os.chdir('..')
164 myret = os.system("tar -czf %s %s" % (ud.localpath, os.path.basename(moddir)))
165
157 if myret != 0: 166 if myret != 0:
158 try: 167 try:
159 os.unlink(ud.localpath) 168 os.unlink(ud.localpath)