diff options
Diffstat (limited to 'firehose/plugin/firehose_plugin.py')
| -rw-r--r-- | firehose/plugin/firehose_plugin.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firehose/plugin/firehose_plugin.py b/firehose/plugin/firehose_plugin.py index 09406aa..05460f8 100644 --- a/firehose/plugin/firehose_plugin.py +++ b/firehose/plugin/firehose_plugin.py @@ -41,16 +41,16 @@ class FirehosePlugin(cliapp.Plugin): def enable(self): self.app.add_subcommand('firehose', self.firehose_cmd, arg_synopsis='some-firehose.yaml...') - self.app.settings.string(['gerrit_username'], + self.app.settings.string(['gerrit-username'], 'Username for gerrit', default=None) - self.app.settings.string(['gerrit_url'], + self.app.settings.string(['gerrit-url'], 'URL for gerrit', default='gerrit.baserock.org') - self.app.settings.string(['git_username'], + self.app.settings.string(['git-username'], 'git username', default=None) - self.app.settings.string(['git_email'], + self.app.settings.string(['git-email'], 'git email address', default=None) @@ -130,8 +130,8 @@ class FirehosePlugin(cliapp.Plugin): log.write('{\"sha\":\"'+sha+'\"}') def insert_githook(self): - gerrit_username = self.app.settings['gerrit_username'] - gerrit_url = self.app.settings['gerrit_url'] + gerrit_username = self.app.settings['gerrit-username'] + gerrit_url = self.app.settings['gerrit-url'] scp_cmd = ('scp', '-p', '-P', '29418', gerrit_username+'@'+gerrit_url+':hooks/commit-msg', self.gitpath+'/.git/hooks/commit-msg') os.system(' '.join(scp_cmd)) @@ -261,8 +261,8 @@ class FirehosePlugin(cliapp.Plugin): return True def commit_and_push(self, name): - gerrit_username = self.app.settings['gerrit_username'] - gerrit_url = self.app.settings['gerrit_url'] + gerrit_username = self.app.settings['gerrit-username'] + gerrit_url = self.app.settings['gerrit-url'] commit_msg = 'Update to '+name+' ref in definitions.git' branch_name = 'HEAD:refs/for/master/firehose/'+name (code, out, err) = self.app.runcmd_unchecked( |