From ad63abee397624ad2e25e63e1b72a2e62b6b8c0f Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 1 Apr 2012 19:07:34 +0200 Subject: [PATCH] Admin-media symlinking sometimes fail under virtualenv. Catching the error and giving a warning instead. --- src/server/initial_setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/initial_setup.py b/src/server/initial_setup.py index e44146945..4e12d44ea 100644 --- a/src/server/initial_setup.py +++ b/src/server/initial_setup.py @@ -174,8 +174,11 @@ def create_admin_media_links(): os.mkdir(apath) os.system('xcopy "%s" "%s" /e /q /c' % (dpath, apath)) if os.name == 'posix': - os.symlink(dpath, apath) - print _(" Admin-media symlinked to ADMIN_MEDIA_ROOT.") + try: + os.symlink(dpath, apath) + print _(" Admin-media symlinked to ADMIN_MEDIA_ROOT.") + except OSError: + print _(" There was an error symlinking Admin-media to ADMIN_MEDIA_ROOT. If you see issues, link manually.") else: print _(" Admin-media files should be copied manually to ADMIN_MEDIA_ROOT.")