summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@torproject.org>2011-11-05 16:55:40 -0300
committerTomás Touceda <chiiph@torproject.org>2011-11-07 15:51:33 -0300
commit849bfc07585efc8ca0cc056022af0ef5246b7ad1 (patch)
treec88147ac8e23f1b62c766542c6dee06592705cff
parentd2f814426fc5bae6315daea3feb8a3f8a2a9efd5 (diff)
Don't exit when trying to create a directory for an installed package
-rw-r--r--lib/thandy/packagesys/ThpPackages.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py
index 4745767..17c0791 100644
--- a/lib/thandy/packagesys/ThpPackages.py
+++ b/lib/thandy/packagesys/ThpPackages.py
@@ -8,6 +8,7 @@ import time
import shutil
import subprocess
import sys
+import errno
from lockfile import LockFile, AlreadyLocked, LockFailed
@@ -261,7 +262,11 @@ class ThpInstaller(PS.Installer):
pass
if "/" in file["name"]:
- os.makedirs("/".join([destPath] + file["name"].split("/")[:-1]))
+ try:
+ os.makedirs(os.path.join(*([destPath] + file["name"].split("/")[:-1])))
+ except OSError, e:
+ if e.errno != errno.EEXIST:
+ raise e
shutil.copy(os.path.join(self._pkg.getTmpPath(), "content", file['name']),
os.path.join(destPath, file['name']));