Patchwork [28/30] oe/patch.py: Remove series file during Clean()

login
mail settings
Submitter Saul Wold
Date May 10, 2011, 5:26 a.m.
Message ID <5b4f5ac5548dc44f88eaf9b7994b2fec77a7baf5.1305004776.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3595/
State New, archived
Headers show

Comments

Saul Wold - May 10, 2011, 5:26 a.m.
From: Khem Raj <raj.khem@gmail.com>

Currently if there is a failed do_patch the series files get appended
so if there were two patches

a.patch
b.patch
and b.patch failed during next run it would append a.patch again
a.patch
b.patch
a.patch

and this would keep growing.

We can remove series file in Clean() because we populate it in Import()
anyway

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Eric Bénard <eric@eukrea.com>
---
 meta/lib/oe/patch.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 16d3d08..1406e19 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -198,6 +198,7 @@  class QuiltTree(PatchSet):
     def Clean(self):
         try:
             self._runcmd(["pop", "-a", "-f"])
+            oe.path.remove(os.path.join(self.dir, "patches","series"))
         except Exception:
             pass
         self.initialized = True