OPEN-76 Fix autobuild so that --config-file option is honoured by subsequent (possibly recursive) commands
Review Request #335 - Created June 10, 2011 and submitted
| Ima Mechanique | Reviewers | ||
| viewer | |||
| OPEN-76 | alain_linden | ||
| None | autobuild | ||
When running a command such as: autobuild configure --config-file ab-test.xml -c ReleaseOS the configuration is only partially completed correctly. When the installables are processed, it does not use the correct configuration file. This is due to cmake calling autobuild install to do the actual install, but not passing the --config-file option. Autobuild falls back to the default autobuild.xml, because the correct configuration file is not saved at any point, which is not the intention and can cause configuration to be done with incorrect libraries. If autobuild.xml is missing or corrupt, an error occurs (which is how I discovered this), stopping the configure command. This fix saves the current value of the configuration file into the AUTOBUILD_CONFIG_FILE environmental variable so that it becomes the default value should any subsequent command need it. I believe that something like this was the original intention when adding this environment variable as part of the default check, but was overlooked.
Ran 'autobuild configure --config-file ab-test.xml -c ReleaseOS' successfully without any errors and was able to build the expected viewer afterwards.
Diff revision 1
This is not the most recent revision of the diff. The latest diff is revision 2. See what's changed.
|
1
2
|
|
|
1
2
|
Expand changes
Hide Extra Whitespace| autobuild/configfile.py | |||
|---|---|---|---|
| Revision 2a560b1d8f95 | New Change | ||
| ... | 191 lines hidden [Expand] | ||
def __load(self, path): |
|||
| 192 |
if saved_data['version'] == self.version: |
192 |
if saved_data['version'] == self.version: |
| 193 |
if (not saved_data.has_key('type')) or (saved_data['type'] != 'autobuild'): |
193 |
if (not saved_data.has_key('type')) or (saved_data['type'] != 'autobuild'): |
| 194 |
raise AutobuildError(self.path + ' not an autobuild configuration file') |
194 |
raise AutobuildError(self.path + ' not an autobuild configuration file') |
| 195 |
package_description = saved_data.pop('package_description', None) |
195 |
package_description = saved_data.pop('package_description', None) |
| 196 |
if package_description is not None: |
196 |
if package_description is not None: |
| 197 |
self.package_description = PackageDescription(package_description) |
197 |
self.package_description = PackageDescription(package_description) |
| 198 |
installables = saved_data.pop('installables', {}) |
198 |
installables = saved_data.pop('installables', {}) |
| 199 |
for (name, package) in installables.iteritems(): |
199 |
for (name, package) in installables.iteritems(): |
| 200 |
self.installables[name] = PackageDescription(package) |
200 |
self.installables[name] = PackageDescription(package) |
| 201 |
self.update(saved_data) |
201 |
self.update(saved_data) |
| 202 |
os.environ['AUTOBUILD_CONFIG_FILE'] = os.path.basename(self.path) |
||
| 202 |
logger.debug("Configuration file '%s'" % self.path) |
203 |
logger.debug("Configuration file '%s'" % self.path) |
| 203 |
else: |
204 |
else: |
| 204 |
if saved_data['version'] in update.updaters: |
205 |
if saved_data['version'] in update.updaters: |
| 205 |
update.updaters[saved_data['version']](saved_data, self) |
206 |
update.updaters[saved_data['version']](saved_data, self) |
| 206 |
else: |
207 |
else: |
| 207 |
raise ConfigurationError("cannot update version %s file %s" % |
208 |
raise ConfigurationError("cannot update version %s file %s" % |
| 208 |
(saved_data.version, self.path)) |
209 |
(saved_data.version, self.path)) |
| 209 |
elif not os.path.exists(self.path): |
210 |
elif not os.path.exists(self.path): |
| 210 |
logger.warn("Configuration file '%s' not found" % self.path) |
211 |
logger.warn("Configuration file '%s' not found" % self.path) |
| 211 |
else: |
212 |
else: |
| ... | 224 lines hidden [Expand] | ||
Other reviews