Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173438
Change subject: trebuchet: Fix-up for Ie6673c8af
......................................................................
trebuchet: Fix-up for Ie6673c8af
'./.' doesn't point to the local Git repository, since we aren't invoking git
from the repository directory.
Change-Id: I296bf161173c98c844fd06b61ae18e411882e2e0
---
M modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/173438/1
diff --git a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
index 39e4892..a3638e3 100644
--- a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
+++ b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
@@ -142,9 +142,9 @@
# Get the SHA1 associated with a Git tag.
def resolve_tag(tag)
- ['origin', './.'].each do |remote|
+ ['origin', target_path].each do |remote|
sha1 = git('ls-remote', remote, '--tags', "refs/tags/#{tag}")
- return sha1[/^\S+/] if sha1.is_a?(String)
+ return sha1[/^\S+/] unless sha1.nil? or sha1.empty?
end
rescue Puppet::ExecutionFailure
end
--
To view, visit https://gerrit.wikimedia.org/r/173438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I296bf161173c98c844fd06b61ae18e411882e2e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
