Rfaulk has submitted this change and it was merged.
Change subject: mod - remove PKEY and PROJECT_PATH deps.
......................................................................
mod - remove PKEY and PROJECT_PATH deps.
Change-Id: I1238467dfacbebbdca9233d134fbbf97b696a653
---
M sartoris/sartoris.py
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 88fd999..d83a7e8 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -27,7 +27,6 @@
from config import log, configure, exit_codes, DEFAULT_CLIENT_HOOK, \
DEFAULT_TARGET_HOOK
-from config_local import PKEY, PROJECT_HOME
class SartorisError(Exception):
@@ -232,9 +231,10 @@
# Iterate through files, those modified will be staged
for elem in os.walk(self.config['top_dir']):
+ relative_path = elem[0].split('./')[-1]
if not search(r'\.git', elem[0]):
- files = [(elem[0] + '/' + file).split(PROJECT_HOME)[-1]
- for file in elem[2]]
+ files = [relative_path + '/' +
+ filename for filename in elem[2]]
log.info(__name__ + ' :: Staging - {0}'.format(files))
_repo.stage(files)
@@ -460,7 +460,8 @@
t = paramiko.Transport(sock)
t.start_client()
- rsa_key = paramiko.RSAKey.from_private_key_file(PKEY)
+ rsa_key = paramiko.RSAKey.from_private_key_file(
+ self.config['deploy.key_path '])
t.auth_publickey(self.config['user.name'], rsa_key)
# Start a scp channel
@@ -491,7 +492,7 @@
ssh.connect(
self.config['target'],
username=self.config['user.name'],
- key_filename=PKEY)
+ key_filename=self.config['deploy.key_path'])
stdin, stdout, stderr = ssh.exec_command(cmd)
stdout = [line.strip() for line in stdout.readlines()]
--
To view, visit https://gerrit.wikimedia.org/r/91350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1238467dfacbebbdca9233d134fbbf97b696a653
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
