diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/patch.py | 4 | ||||
-rw-r--r-- | meta/lib/oe/path.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index a5b31b8f8d..17b7e1f27d 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -220,7 +220,7 @@ class GitApplyTree(PatchTree): | |||
220 | 220 | ||
221 | class QuiltTree(PatchSet): | 221 | class QuiltTree(PatchSet): |
222 | def _runcmd(self, args, run = True): | 222 | def _runcmd(self, args, run = True): |
223 | quiltrc = self.d.getVar('QUILTRCFILE', 1) | 223 | quiltrc = self.d.getVar('QUILTRCFILE', True) |
224 | if not run: | 224 | if not run: |
225 | return ["quilt"] + ["--quiltrc"] + [quiltrc] + args | 225 | return ["quilt"] + ["--quiltrc"] + [quiltrc] + args |
226 | runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) | 226 | runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) |
@@ -398,7 +398,7 @@ class UserResolver(Resolver): | |||
398 | # Patch application failed | 398 | # Patch application failed |
399 | patchcmd = self.patchset.Push(True, False, False) | 399 | patchcmd = self.patchset.Push(True, False, False) |
400 | 400 | ||
401 | t = self.patchset.d.getVar('T', 1) | 401 | t = self.patchset.d.getVar('T', True) |
402 | if not t: | 402 | if not t: |
403 | bb.msg.fatal("Build", "T not set") | 403 | bb.msg.fatal("Build", "T not set") |
404 | bb.utils.mkdirhier(t) | 404 | bb.utils.mkdirhier(t) |
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 8eaa3c5da4..683b09701c 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py | |||
@@ -42,7 +42,7 @@ def relative(src, dest): | |||
42 | 42 | ||
43 | def format_display(path, metadata): | 43 | def format_display(path, metadata): |
44 | """ Prepare a path for display to the user. """ | 44 | """ Prepare a path for display to the user. """ |
45 | rel = relative(metadata.getVar("TOPDIR", 1), path) | 45 | rel = relative(metadata.getVar("TOPDIR", True), path) |
46 | if len(rel) > len(path): | 46 | if len(rel) > len(path): |
47 | return path | 47 | return path |
48 | else: | 48 | else: |