From 3ffaf38655b4abaf9a4df738b735144befc69d3b Mon Sep 17 00:00:00 2001 From: Martin Langhoff Date: Sun, 08 Nov 2009 20:03:10 +0000 Subject: Fix failure to start if older CWD is missing --- diff --git a/terminal.py b/terminal.py index 9232545..bc433f3 100644 --- a/terminal.py +++ b/terminal.py @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import os +import sys import simplejson import ConfigParser import logging @@ -293,8 +294,12 @@ class TerminalActivity(activity.Activity): # os.environ['TERMINAL_ENV'] = '\n'.join(filtered_env) # Restore the working directory. - if 'cwd' in tab_state: - os.chdir(tab_state['cwd']) + if 'cwd' in tab_state and os.path.exists(tab_state['cwd']): + try: + os.chdir(tab_state['cwd']) + except: + # ACLs may deny access + sys.stdout.write("Could not chdir to " + tab_state['cwd']) # Restore the scrollback buffer. for l in tab_state['scrollback']: -- cgit v0.9.1