diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/osc.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 295abf953b..26f88e1f46 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
@@ -34,7 +34,7 @@ class Osc(FetchMethod): | |||
34 | 34 | ||
35 | # Create paths to osc checkouts | 35 | # Create paths to osc checkouts |
36 | relpath = self._strip_leading_slashes(ud.path) | 36 | relpath = self._strip_leading_slashes(ud.path) |
37 | ud.pkgdir = os.path.join(d.getVar('OSCDIR', True), ud.host) | 37 | ud.pkgdir = os.path.join(d.getVar('OSCDIR'), ud.host) |
38 | ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module) | 38 | ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module) |
39 | 39 | ||
40 | if 'rev' in ud.parm: | 40 | if 'rev' in ud.parm: |
@@ -84,7 +84,7 @@ class Osc(FetchMethod): | |||
84 | 84 | ||
85 | logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") | 85 | logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") |
86 | 86 | ||
87 | if os.access(os.path.join(d.getVar('OSCDIR', True), ud.path, ud.module), os.R_OK): | 87 | if os.access(os.path.join(d.getVar('OSCDIR'), ud.path, ud.module), os.R_OK): |
88 | oscupdatecmd = self._buildosccommand(ud, d, "update") | 88 | oscupdatecmd = self._buildosccommand(ud, d, "update") |
89 | logger.info("Update "+ ud.url) | 89 | logger.info("Update "+ ud.url) |
90 | # update sources there | 90 | # update sources there |
@@ -112,7 +112,7 @@ class Osc(FetchMethod): | |||
112 | Generate a .oscrc to be used for this run. | 112 | Generate a .oscrc to be used for this run. |
113 | """ | 113 | """ |
114 | 114 | ||
115 | config_path = os.path.join(d.getVar('OSCDIR', True), "oscrc") | 115 | config_path = os.path.join(d.getVar('OSCDIR'), "oscrc") |
116 | if (os.path.exists(config_path)): | 116 | if (os.path.exists(config_path)): |
117 | os.remove(config_path) | 117 | os.remove(config_path) |
118 | 118 | ||
@@ -121,8 +121,8 @@ class Osc(FetchMethod): | |||
121 | f.write("apisrv = %s\n" % ud.host) | 121 | f.write("apisrv = %s\n" % ud.host) |
122 | f.write("scheme = http\n") | 122 | f.write("scheme = http\n") |
123 | f.write("su-wrapper = su -c\n") | 123 | f.write("su-wrapper = su -c\n") |
124 | f.write("build-root = %s\n" % d.getVar('WORKDIR', True)) | 124 | f.write("build-root = %s\n" % d.getVar('WORKDIR')) |
125 | f.write("urllist = %s\n" % d.getVar("OSCURLLIST", True)) | 125 | f.write("urllist = %s\n" % d.getVar("OSCURLLIST")) |
126 | f.write("extra-pkgs = gzip\n") | 126 | f.write("extra-pkgs = gzip\n") |
127 | f.write("\n") | 127 | f.write("\n") |
128 | f.write("[%s]\n" % ud.host) | 128 | f.write("[%s]\n" % ud.host) |