summaryrefslogtreecommitdiff
path: root/firehose/plugin/firehose_plugin.py
diff options
context:
space:
mode:
authorBob Mottram <bob.mottram@codethink.co.uk>2015-03-31 11:59:59 +0100
committerFrancisco Redondo <francisco.marchena@codethink.co.uk>2015-06-11 15:58:36 +0000
commite9be89d2d8ec884d890e9db90e37de3981f3b83e (patch)
treecf74bfa95c39a4cee29474d78e797843cdff4f08 /firehose/plugin/firehose_plugin.py
parent455d894edb636acea2009cbb38e69d4dfb35631a (diff)
downloadfirehose-e9be89d2d8ec884d890e9db90e37de3981f3b83e.tar.gz
Change myref to destref
Change the variable name to be a little more descriptive This is the destination branch into which commits from tracking will be pulled Change-Id: If312bb545ca4275898f9a6f6a6e1a351dd93abb7
Diffstat (limited to 'firehose/plugin/firehose_plugin.py')
-rw-r--r--firehose/plugin/firehose_plugin.py10
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()