Gehel has submitted this change and it was merged.

Change subject: Use repo_path instead of repo for deploy-local
......................................................................


Use repo_path instead of repo for deploy-local

deploy-local expects the --repo param to contain the path on the
deployment host to the repo. `repo_path` not necessarily `repo` would be
correct in this instance.

Change-Id: Ibaee6747518adf0483160db1b4dbbd94cfd26217
---
M modules/scap/lib/puppet/provider/package/scap3.rb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gehel: Looks good to me, approved
  Chad: Looks good to me, but someone else must approve
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/scap/lib/puppet/provider/package/scap3.rb 
b/modules/scap/lib/puppet/provider/package/scap3.rb
index 8b3d6e3..d7fe341 100644
--- a/modules/scap/lib/puppet/provider/package/scap3.rb
+++ b/modules/scap/lib/puppet/provider/package/scap3.rb
@@ -51,11 +51,11 @@
 
     FileUtils.chown_R(deploy_user, nil, deploy_root)
 
-    Puppet.debug "scap pkg [#{repo}] root=#{deploy_root}, user=#{deploy_user}"
+    Puppet.debug "scap pkg [#{repo_path}] root=#{deploy_root}, 
user=#{deploy_user}"
 
     uid = Etc.getpwnam(deploy_user).uid
 
-    execute([self.class.command(:deploy_local), '--repo', repo, '-D', 
'log_json:False'],
+    execute([self.class.command(:deploy_local), '--repo', repo_path, '-D', 
'log_json:False'],
             :uid => uid, :failonfail => true)
   end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/275905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaee6747518adf0483160db1b4dbbd94cfd26217
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to