diff options
Diffstat (limited to 'firehose/plugin/firehose_plugin.py')
| -rw-r--r-- | firehose/plugin/firehose_plugin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firehose/plugin/firehose_plugin.py b/firehose/plugin/firehose_plugin.py index 15b5844..09406aa 100644 --- a/firehose/plugin/firehose_plugin.py +++ b/firehose/plugin/firehose_plugin.py @@ -73,8 +73,8 @@ class FirehosePlugin(cliapp.Plugin): raise cliapp.AppException("Not all firehoses have the same landing repo") if len(set(c.landing_baseref for c in confs)) > 1: raise cliapp.AppException("Not all firehoses have the same landing baseref") - if len(set(c.landing_myref for c in confs)) > 1: - raise cliapp.AppException("Not all firehoses have the same landing myref") + if len(set(c.landing_destref for c in confs)) > 1: + raise cliapp.AppException("Not all firehoses have the same landing destref") # Ensure that all incoming configurations have unique things they are @@ -109,14 +109,14 @@ class FirehosePlugin(cliapp.Plugin): def make_branch(self, root): os.chdir(self.make_path("ws")) try: - self.app.subcommands['branch']([root['repo'], root['myref'], root['baseref']]) + self.app.subcommands['branch']([root['repo'], root['destref'], root['baseref']]) except cliapp.AppException, ae: if "already exists in" in str(ae): - self.app.subcommands['checkout']([root['repo'], root['myref']]) + self.app.subcommands['checkout']([root['repo'], root['destref']]) else: raise repopath = root['repo'].replace(':', '/') - self.gitpath = self.make_path("ws", root['myref'], repopath) + self.gitpath = self.make_path("ws", root['destref'], repopath) def log_sha(self, name): sha = self.app.runcmd(['git', 'rev-parse', 'HEAD'], cwd=self.gitpath).strip() |