From ac954333c4d8f816c3bdee4936aa63a4d159a0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 12 Oct 2005 17:13:37 +0000 Subject: [PATCH] =?UTF-8?q?exception=20problemi=20d=C3=BCzeltildi...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/actionsapi/pisitools.py | 4 +--- pisi/actionsapi/shelltools.py | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 8dc29ba1..1f0527cd 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -194,9 +194,7 @@ def dosym(sourceFile, destinationFile): '''creates soft link between sourceFile and destinationFile''' ''' example call: pisitools.dosym("/usr/bin/bash", "/bin/bash")''' - path = join_path(get.installDIR(), os.path.dirname(destinationFile)) - if not os.access(path, os.F_OK): - makedirs(path) + makedirs(join_path(get.installDIR(), os.path.dirname(destinationFile))) try: os.symlink(sourceFile, join_path(get.installDIR() ,destinationFile)) diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py index 43846671..b52368a5 100644 --- a/pisi/actionsapi/shelltools.py +++ b/pisi/actionsapi/shelltools.py @@ -40,7 +40,8 @@ def can_access_directory(destinationDirectory): def makedirs(destinationDirectory): '''recursive directory creation function''' try: - os.makedirs(destinationDirectory) + if not os.access(destinationDirectory, os.F_OK): + os.makedirs(destinationDirectory) except OSError: error(_('Cannot create directory %s' % destinationDirectory))