reame _runcmd to run_quilt

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 246fc6221f9cd8d5512abea2e5b3ab3609b64809..9887af4442c59165a73bc2377e722256870f78f5 100644 (file)
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -661,11 +661,13 @@ class GitApplyTree(PatchTree):
 
 
 class QuiltTree(PatchSet):
-    def _runcmd(self, args, run = True):
+    def run_quilt(self, args, run=True):
         quiltrc = self.d.getVar('QUILTRCFILE')
-        if not run:
-            return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
-        runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
+        cmd = ["quilt"] + ["--quiltrc"] + [quiltrc] + args
+        if run:
+            runcmd(cmd, dir=self.dir)
+        else:
+            return cmd
 
     def _quiltpatchpath(self, file):
         return os.path.join(self.dir, "patches", os.path.basename(file))
@@ -682,7 +684,7 @@ class QuiltTree(PatchSet):
         try:
             # make sure that patches/series file exists before quilt pop to keep quilt-0.67 happy
             open(os.path.join(self.dir, "patches","series"), 'a').close()
-            self._runcmd(["pop", "-a", "-f"])
+            self.run_quilt(["pop", "-a", "-f"])
             oe.path.remove(os.path.join(self.dir, "patches","series"))
         except Exception:
             pass
@@ -706,7 +708,7 @@ class QuiltTree(PatchSet):
 
             # determine which patches are applied -> self._current
             try:
-                output = runcmd(["quilt", "applied"], self.dir)
+                output = self.run_quilt(["applied"])
             except CmdError:
                 import sys
                 if sys.exc_value.output.strip() == "No patches applied":
@@ -745,9 +747,9 @@ class QuiltTree(PatchSet):
         if all:
             args.append("-a")
         if not run:
-            return self._runcmd(args, run)
+            return self.run_quilt(args, run)
 
-        self._runcmd(args)
+        self.run_quilt(args)
 
         if self._current is not None:
             self._current = self._current + 1
@@ -762,7 +764,7 @@ class QuiltTree(PatchSet):
         if all:
             args.append("-a")
 
-        self._runcmd(args)
+        self.run_quilt(args)
 
         if self._current == 0:
             self._current = None
@@ -791,7 +793,7 @@ class QuiltTree(PatchSet):
                 args.append(os.path.basename(kwargs["quiltfile"]))
             elif kwargs.get("patch"):
                 args.append(os.path.basename(self.patches[kwargs["patch"]]["quiltfile"]))
-            self._runcmd(args)
+            self.run_quilt(args)
 
 class Resolver(object):
     def __init__(self, patchset, terminal):