[PATCH] oe/patch.py: Remove series file during Clean()

[PATCH] oe/patch.py: Remove series file during Clean()

[Khem Raj]

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>
---
 lib/oe/patch.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/oe/patch.py b/lib/oe/patch.py
index d7f4ccb..05abccf 100644
--- a/lib/oe/patch.py
+++ b/lib/oe/patch.py
@@ -192,6 +192,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
-- 
1.7.1

Re: [PATCH] oe/patch.py: Remove series file during Clean()

[Chris Larson]

On Wed, Sep 22, 2010 at 2:02 PM, Khem Raj <raj.khem@gmail.com> wrote:

> 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>
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [PATCH] oe/patch.py: Remove series file during Clean()

[Eric Bénard]

Le 22/09/2010 23:36, Chris Larson a écrit :
> On Wed, Sep 22, 2010 at 2:02 PM, Khem Raj<raj.khem@gmail.com>  wrote:
>
>> 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>