Sophie

Sophie

distrib > Mandriva > cooker > x86_64 > by-pkgid > ce065ae37e3632227692d3e881fb3938 > files > 1

gonzui-1.2-4mdv2009.0.src.rpm

Index: gonzui/vcs.rb
This patch allows to have more than one cvs added to the search engine.
Without it, it overwrite the cache that hold cvs checkout.

===================================================================
--- gonzui/vcs.rb
+++ gonzui/vcs.rb	2005-11-03 16:32:33.000000000 +0100
@@ -19,6 +19,8 @@
       require_command("cvs")
       @config = config
       @root = root
+      clean_root = @root.gsub(/\W/,'_')
+      @cache_dir = File.join(@config.cache_directory, clean_root)
       @mozule = mozule
     end
 
@@ -32,8 +34,8 @@
 
     public
     def extract
-      File.mkpath(@config.cache_directory)
-      output_directory = File.join(@config.cache_directory, @mozule)
+      File.mkpath(@cache_dir)
+      output_directory = File.join(@cache_dir, @mozule)
       if not File.exist?(output_directory)
         do_checkout(output_directory)
       elsif File.directory?(output_directory)
@@ -55,7 +57,7 @@
     end
 
     def do_checkout(output_directory)
-      Dir.chdir(@config.cache_directory) {
+      Dir.chdir(@cache_dir) {
         command_line = sprintf("cvs -z3 -d %s co -P %s", 
                                shell_escape(@root),
                                shell_escape(@mozule))
@@ -70,8 +72,8 @@
     end
 
     def do_extract
-      File.mkpath(@config.cache_directory)
-      output_directory = File.join(@config.cache_directory, @mozule)
+      File.mkpath(@cache_dir)
+      output_directory = File.join(@cache_dir, @mozule)
       if File.exist?(output_directory)
         run_cvs_update(output_directory)
       else
@@ -88,7 +90,7 @@
     end
 
     def do_checkout(output_directory)
-      Dir.chdir(@config.cache_directory) {
+      Dir.chdir(@cache_dir) {
         command_line = sprintf("svn co %s %s", 
                                shell_escape(@root),
                                shell_escape(@mozule))