summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-23 15:43:47 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-23 15:43:47 +0000
commitb77ca582eb4ec5df34cc81b9b5187a1cebb13532 (patch)
treea4f542ac664bc752a7c0ca318af422e75688a44d
parentf9d8477c8faa13622acadf92d8bb9cc83f9b40dc (diff)
handle tars which duplicate file names properly
git-svn-id: file:///home/lennart/svn/public/sse/trunk@40 5fbabb74-0606-0410-a5e4-b5cc6a42724e
-rwxr-xr-xfeed/sse_tar.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/feed/sse_tar.py b/feed/sse_tar.py
index 45700f9..a964d1a 100755
--- a/feed/sse_tar.py
+++ b/feed/sse_tar.py
@@ -29,6 +29,10 @@ def uncompress_tar(archive, root, package_id, meta = {}):
dst = os.path.join(root, i.name)
+ if os.access(dst, os.F_OK):
+ print "WARNING: File '%s' already extracted."
+ continue
+
try:
os.makedirs(os.path.dirname(dst))
except:
@@ -66,6 +70,10 @@ def uncompress_zip(archive, root, package_id, meta = {}):
dst = os.path.join(root, i.filename)
+ if os.access(dst, os.F_OK):
+ print "WARNING: File '%s' already extracted"
+ continue
+
try:
os.makedirs(os.path.dirname(dst))
except: