lib/apps/git.rb in dev-2.0.289 vs lib/apps/git.rb in dev-2.0.290
- old
+ new
@@ -150,15 +150,22 @@
def self.copy(src_url,src_directory,branch,target_directory,filelist)
if(!File.exists?(src_directory))
puts "git clone #{src_url} #{src_directory}"
puts `git clone #{src_url} #{src_directory}`
else
+ puts "chdir #{src_directory}"
Dir.chdir(src_directory) do
puts "git pull"
- puts `git pull`
+ git_pull=Command.new('git pull')
+ git_pull[:directory]=src_directory
+ git_pull[:timeout] = 30
+ git_pull[:ignore_failure] =true
+ git_pull.execute
+
end
end
+ puts "chdir #{src_directory}"
Dir.chdir(src_directory) do
puts "git checkout #{branch}"
puts `git checkout #{branch}`
filelist.each{|f|
dest="#{target_directory}/#{f}"
\ No newline at end of file