summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--morphlib/stagingarea.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index 59908d5f..8d0cd0e6 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -102,17 +102,16 @@ class StagingArea(object):
# overwriting files.
def monkey_patcher(real):
- def make_something(tarinfo, targetpath):
+ def make_something(tarinfo, targetpath): # pragma: no cover
try:
return real(tarinfo, targetpath)
except OSError, e:
- if e.errno == errno.EEXIST:
- pass
- elif e.filename is None:
- e.filename = targetpath
- raise e
- else:
- raise
+ if e.errno != errno.EEXIST:
+ if e.filename is None:
+ e.filename = targetpath
+ raise e
+ else:
+ raise
return make_something
tf.makedir = monkey_patcher(tf.makedir)