comparison mozillatry.py @ 17:7ca5d9a3b157

expanduser
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 04 Dec 2012 16:50:20 -0800
parents 6a3754236d1f
children 328e88120fc2
comparison
equal deleted inserted replaced
16:6a3754236d1f 17:7ca5d9a3b157
102 configuration.Configuration.validate(self) 102 configuration.Configuration.validate(self)
103 103
104 if (not self.config.get('opt')) and (not self.config.get('debug')): 104 if (not self.config.get('opt')) and (not self.config.get('debug')):
105 raise ConfigurationError("Must have opt or debug builds") 105 raise ConfigurationError("Must have opt or debug builds")
106 106
107 self.config['mozilla_central'] = os.path.expanduser(self.config['mozilla_central'])
107 try_directory = self.config.get('mozilla_central') 108 try_directory = self.config.get('mozilla_central')
108 if (try_directory is None) or (not os.path.exists(try_directory)): 109 if (try_directory is None) or (not os.path.exists(try_directory)):
109 raise ConfigurationError("mozilla-central directory does not exist: %s" % try_directory) 110 raise ConfigurationError("mozilla-central directory does not exist: %s" % try_directory)
110 111
111 config['mozilla_central'] = os.path.expanduser(config['mozilla_central'])
112 # TODO: make a 'path' type 112 # TODO: make a 'path' type
113 113
114 def configuration_files(self, options, args): 114 def configuration_files(self, options, args):
115 configuration_files = configuration.Configuration.configuration_files(self, options, args) 115 configuration_files = configuration.Configuration.configuration_files(self, options, args)
116 if not configuration_files: 116 if not configuration_files: