whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastian Bazley <s...@apache.org>
Subject [whimsy.git] [2/2] Commit 9d1cefc: Merge branch 'master' of https://github.com/apache/whimsy.git
Date Fri, 22 Jan 2016 12:03:40 GMT
Commit 9d1cefc8a25366e730a6206c820680fdcd7a4835:
    Merge branch 'master' of https://github.com/apache/whimsy.git


Branch: refs/heads/master
Author: Sebb <sebb@apache.org>
Committer: Sebb <sebb@apache.org>
Pusher: sebb <sebb@apache.org>

------------------------------------------------------------
lib/whimsy/asf/svn.rb                                        | + 
www/board/agenda/Gemfile                                     | ++++ -
------------------------------------------------------------
6 changes: 5 additions, 1 deletions.
------------------------------------------------------------


diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 746e02d..06003a4 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -14,6 +14,7 @@ def self.repos
       @semaphore.synchronize do
         svn = ASF::Config.get(:svn).map {|dir| dir.untaint}
         @repos ||= Hash[Dir[*svn].map { |name| 
+          next unless Dir.exist? name.untaint
           Dir.chdir name.untaint do
             out, err, status = Open3.capture3('svn', 'info')
             if status.success?
diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile
index c94b75d..cf36bde 100644
--- a/www/board/agenda/Gemfile
+++ b/www/board/agenda/Gemfile
@@ -1,12 +1,15 @@
 source 'https://rubygems.org'
 
+root = '../../../..'
+asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp
+gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
+
 gem 'rake'
 gem 'wunderbar', '>= 1.0.0'
 gem 'ruby2js', '>= 2.0.13'
 gem 'sinatra'
 gem 'nokogumbo'
 gem 'execjs', ('<2.5.1' if RUBY_VERSION =~ /^1/)
-gem 'whimsy-asf', '>= 0.0.14'
 gem 'listen', ('~> 2.10' if RUBY_VERSION =~ /^1/)
 gem 'activesupport'
 gem 'mail'

Mime
View raw message