You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/06/28 23:16:21 UTC
[whimsy] branch master updated: Oops, misplaced and missing code
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 2477021 Oops, misplaced and missing code
2477021 is described below
commit 247702145edebff31a9a6636dcb2a61b985e6c51
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jun 29 00:16:11 2020 +0100
Oops, misplaced and missing code
---
lib/whimsy/asf/git.rb | 3 ++-
lib/whimsy/asf/svn.rb | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/whimsy/asf/git.rb b/lib/whimsy/asf/git.rb
index f093320..3fbb367 100644
--- a/lib/whimsy/asf/git.rb
+++ b/lib/whimsy/asf/git.rb
@@ -55,9 +55,10 @@ module ASF
if repo_override
git_over = repo_override[:git]
if git_over
+ require 'wunderbar'
Wunderbar.warn("Found override for repository.yml[:git]")
+ @@repository_entries[:git].merge!(git_over)
end
- @@repository_entries[:git].merge!(git_over)
end
@repos = Hash[Dir[*git].map { |name|
diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 94a9644..6f0b48b 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -45,6 +45,7 @@ module ASF
if repo_override
svn_over = repo_override[:svn]
if svn_over
+ require 'wunderbar'
Wunderbar.warn("Found override for repository.yml[:svn]")
end
@@repository_entries[:svn].merge!(svn_over)