locate error.txt for projects without an explicit commit param

docmeta · Aug 24, 2010 · 70cc7eb · 70cc7eb
1 parent 55c86a0
commit 70cc7eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app.rb b/app.rb
@@ -175,11 +175,11 @@ def shorten_commit_link(commit)
       return "YES" if libs.find {|l| l.version == params[:commit] }
     end
 
-    if File.file?("#{options.tmp}/#{[params[:project], params[:username], params[:commit]].join('_')}.error.txt")
-      puts "#{options.tmp}/#{[params[:project], params[:username], params[:commit]].join('_')}.error.txt found"
+    if File.file?("#{options.tmp}/#{[params[:project], params[:username], params[:commit] || 'master'].join('_')}.error.txt")
+      puts "#{options.tmp}/#{[params[:project], params[:username], params[:commit] || 'master'].join('_')}.error.txt found"
       "ERROR"
     else
-      puts "#{options.tmp}/#{[params[:project], params[:username], params[:commit]].join('_')}.error.txt not found"
+      puts "#{options.tmp}/#{[params[:project], params[:username], params[:commit] || 'master'].join('_')}.error.txt not found"
       "NO"
     end
   end

diff --git a/lib/scm_checkout.rb b/lib/scm_checkout.rb
@@ -41,7 +41,7 @@ def checkout(url, name, commit = nil, scheme = "git")
     out = `#{co_cmd}`
     result = $?
     puts "#{Time.now}: Checkout command (#{result}): #{co_cmd}"
-    errorfile = "#{options.tmp}/#{[name.gsub('/', '_'), commit].join('_')}.error.txt"
+    errorfile = "#{options.tmp}/#{[name.gsub('/', '_'), commit || 'master'].join('_')}.error.txt"
     if result == 0
       register_project(name)
       File.unlink(errorfile) if File.file?(errorfile)