From 29f35250b009101a3ac86353da9512879ecface3 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 27 Apr 2012 18:43:49 +0100
Subject: stagingarea: when extracting, clobber output

I really don't like this, but it causes the bootstrap to fail
because /bin/bash exists for compatibility and the stratum
also creates /bin/bash.
---
 morphlib/stagingarea.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'morphlib')

diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index d0eec599..f730fd51 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -103,6 +103,9 @@ class StagingArea(object):
         
         def monkey_patcher(real):
             def make_something(tarinfo, targetpath): # pragma: no cover
+                if os.path.exists(targetpath):
+                    try:     os.remove(targetpath)
+                    except:  pass
                 try:
                     return real(tarinfo, targetpath)
                 except OSError, e:
-- 
cgit v1.2.1