diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/cvs.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/cvs.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py index 5ff70ba921..64c50c2165 100644 --- a/bitbake/lib/bb/fetch2/cvs.py +++ b/bitbake/lib/bb/fetch2/cvs.py | |||
@@ -87,10 +87,10 @@ class Cvs(FetchMethod): | |||
87 | cvsroot = ud.path | 87 | cvsroot = ud.path |
88 | else: | 88 | else: |
89 | cvsroot = ":" + method | 89 | cvsroot = ":" + method |
90 | cvsproxyhost = d.getVar('CVS_PROXY_HOST', True) | 90 | cvsproxyhost = d.getVar('CVS_PROXY_HOST') |
91 | if cvsproxyhost: | 91 | if cvsproxyhost: |
92 | cvsroot += ";proxy=" + cvsproxyhost | 92 | cvsroot += ";proxy=" + cvsproxyhost |
93 | cvsproxyport = d.getVar('CVS_PROXY_PORT', True) | 93 | cvsproxyport = d.getVar('CVS_PROXY_PORT') |
94 | if cvsproxyport: | 94 | if cvsproxyport: |
95 | cvsroot += ";proxyport=" + cvsproxyport | 95 | cvsroot += ";proxyport=" + cvsproxyport |
96 | cvsroot += ":" + ud.user | 96 | cvsroot += ":" + ud.user |
@@ -110,7 +110,7 @@ class Cvs(FetchMethod): | |||
110 | if ud.tag: | 110 | if ud.tag: |
111 | options.append("-r %s" % ud.tag) | 111 | options.append("-r %s" % ud.tag) |
112 | 112 | ||
113 | cvsbasecmd = d.getVar("FETCHCMD_cvs", True) | 113 | cvsbasecmd = d.getVar("FETCHCMD_cvs") |
114 | cvscmd = cvsbasecmd + " '-d" + cvsroot + "' co " + " ".join(options) + " " + ud.module | 114 | cvscmd = cvsbasecmd + " '-d" + cvsroot + "' co " + " ".join(options) + " " + ud.module |
115 | cvsupdatecmd = cvsbasecmd + " '-d" + cvsroot + "' update -d -P " + " ".join(options) | 115 | cvsupdatecmd = cvsbasecmd + " '-d" + cvsroot + "' update -d -P " + " ".join(options) |
116 | 116 | ||
@@ -120,8 +120,8 @@ class Cvs(FetchMethod): | |||
120 | 120 | ||
121 | # create module directory | 121 | # create module directory |
122 | logger.debug(2, "Fetch: checking for module directory") | 122 | logger.debug(2, "Fetch: checking for module directory") |
123 | pkg = d.getVar('PN', True) | 123 | pkg = d.getVar('PN') |
124 | pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg) | 124 | pkgdir = os.path.join(d.getVar('CVSDIR'), pkg) |
125 | moddir = os.path.join(pkgdir, localdir) | 125 | moddir = os.path.join(pkgdir, localdir) |
126 | workdir = None | 126 | workdir = None |
127 | if os.access(os.path.join(moddir, 'CVS'), os.R_OK): | 127 | if os.access(os.path.join(moddir, 'CVS'), os.R_OK): |
@@ -164,8 +164,8 @@ class Cvs(FetchMethod): | |||
164 | def clean(self, ud, d): | 164 | def clean(self, ud, d): |
165 | """ Clean CVS Files and tarballs """ | 165 | """ Clean CVS Files and tarballs """ |
166 | 166 | ||
167 | pkg = d.getVar('PN', True) | 167 | pkg = d.getVar('PN') |
168 | pkgdir = os.path.join(d.getVar("CVSDIR", True), pkg) | 168 | pkgdir = os.path.join(d.getVar("CVSDIR"), pkg) |
169 | 169 | ||
170 | bb.utils.remove(pkgdir, True) | 170 | bb.utils.remove(pkgdir, True) |
171 | bb.utils.remove(ud.localpath) | 171 | bb.utils.remove(ud.localpath) |