Add branching and pushing to bugfix scenrio

1 files changed, 4 insertions, 4 deletions

diff --git a/yarnhelper.py b/yarnhelper.py
index 8af9cf5..7192b06 100644
--- a/yarnhelper.py
+++ b/yarnhelper.py
@@ -147,11 +147,13 @@ class YarnHelper(object):
     def repo_ssh_url(self, repo):  # pragma: no cover
         return 'ssh://git@{}/{}'.format(os.environ['GITANO_SERVER'], repo)
 
+    def local_checkout_dirname(self, user, repo):  # pragma: no cover
+        return '{}_{}'.format(user, repo)
+
     def git_as(self, user, args):  # pragma: no cover
         server = os.environ['GITANO_SERVER']
         env = dict(os.environ)
         env['GIT_SSH_COMMAND'] = self.env_ssh_command(user)
-        print 'g_s_c:', env['GIT_SSH_COMMAND']
         return cliapp.runcmd(
             ['git'] + args,
             stderr=subprocess.STDOUT,
@@ -162,10 +164,8 @@ class YarnHelper(object):
             'ssh',
             '-o', 'PasswordAuthentication=no',
             '-o', 'IdentitiesOnly=yes',
+            '-i', self.get_user_ssh_key(user),
         ]
-        if user is not None:
-            key = self.ssh_key_file_for_user(user)
-            argv.extend(['-i', key])
         return ' '.join(argv)
 
     def get_admin_ssh_key(self):  # pragma: no cover