fixes for triton->tritonapi renaming

This commit is contained in:
Trent Mick 2015-09-08 22:55:29 -07:00
parent 2baf40d841
commit a3d362423b
2 changed files with 6 additions and 5 deletions

View File

@ -36,7 +36,7 @@ function do_profiles(subcmd, opts, args, cb) {
var profiles; var profiles;
try { try {
profiles = mod_config.loadAllProfiles({ profiles = mod_config.loadAllProfiles({
configDir: this.triton.config._configDir, configDir: this.tritonapi.config._configDir,
log: this.log log: this.log
}); });
} catch (e) { } catch (e) {
@ -48,12 +48,12 @@ function do_profiles(subcmd, opts, args, cb) {
var i; var i;
if (opts.json) { if (opts.json) {
for (i = 0; i < profiles.length; i++) { for (i = 0; i < profiles.length; i++) {
profiles[i].curr = (profiles[i].name === this.triton.profile.name); profiles[i].curr = (profiles[i].name === this.tritonapi.profile.name);
} }
common.jsonStream(profiles); common.jsonStream(profiles);
} else { } else {
for (i = 0; i < profiles.length; i++) { for (i = 0; i < profiles.length; i++) {
profiles[i].curr = (profiles[i].name === this.triton.profile.name profiles[i].curr = (profiles[i].name === this.tritonapi.profile.name
? '*' : ''); ? '*' : '');
} }
tabula(profiles, { tabula(profiles, {

View File

@ -120,7 +120,8 @@ TritonApi.prototype._cloudapiFromProfile =
return client; return client;
}; };
Triton.prototype._cachePutJson = function _cachePutJson(key, obj, cb) {
TritonApi.prototype._cachePutJson = function _cachePutJson(key, obj, cb) {
var self = this; var self = this;
assert.string(this.cacheDir, 'this.cacheDir'); assert.string(this.cacheDir, 'this.cacheDir');
assert.string(key, 'key'); assert.string(key, 'key');
@ -137,7 +138,7 @@ Triton.prototype._cachePutJson = function _cachePutJson(key, obj, cb) {
}); });
}; };
Triton.prototype._cacheGetJson = function _cacheGetJson(key, cb) { TritonApi.prototype._cacheGetJson = function _cacheGetJson(key, cb) {
var self = this; var self = this;
assert.string(this.cacheDir, 'this.cacheDir'); assert.string(this.cacheDir, 'this.cacheDir');
assert.string(key, 'key'); assert.string(key, 'key');