whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] 02/02: Tidyup; unnecessary untaints
Date Tue, 29 Sep 2020 21:51:36 GMT
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

commit 10ce1062e57b42016c9b3836badd2f479937d257
Author: Sebb <sebb@apache.org>
AuthorDate: Tue Sep 29 22:51:26 2020 +0100

    Tidyup; unnecessary untaints
---
 lib/whimsy/asf/git.rb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/whimsy/asf/git.rb b/lib/whimsy/asf/git.rb
index 47826ae..00e4e15 100644
--- a/lib/whimsy/asf/git.rb
+++ b/lib/whimsy/asf/git.rb
@@ -1,4 +1,3 @@
-require 'thread'
 require 'open3'
 
 module ASF
@@ -29,8 +28,7 @@ module ASF
     end
 
     # path to <tt>repository.yml</tt> in the source.
-    REPOSITORY = File.expand_path('../../../../repository.yml', __FILE__).
-      untaint
+    REPOSITORY = File.expand_path('../../../repository.yml', __dir__)
 
     @semaphore = Mutex.new
     @@repository_mtime = nil
@@ -41,10 +39,10 @@ module ASF
     #
     def self.repos
       @semaphore.synchronize do
-        git = Array(ASF::Config.get(:git)).map {|dir| dir.untaint}
+        git = Array(ASF::Config.get(:git))
 
         # reload if repository changes
-        if File.exist?(REPOSITORY) && @@repository_mtime!=File.mtime(REPOSITORY)
+        if File.exist?(REPOSITORY) && @@repository_mtime != File.mtime(REPOSITORY)
           @repos = nil
         end
 
@@ -62,7 +60,7 @@ module ASF
           end
 
           @repos = Hash[Dir[*git].map { |name|
-            if Dir.exist? name.untaint
+            if Dir.exist? name
               out, _, status =
                 Open3.capture3(*%(git config --get remote.origin.url), {chdir: name})
               if status.success?
@@ -100,11 +98,7 @@ module ASF
     # Find a local git clone.  Raises an exception if not found.
     #
     def self.find!(name)
-      result = self.find(name)
-
-      if not result
-        raise Exception.new("Unable to find git clone for #{name}")
-      end
+      result = self.find(name) or raise ArgumentError, "Unable to find git clone for #{name}"
 
       result
     end


Mime
View raw message