remotebackup 0.50.8 → 0.50.9

data/bin/restore_backup

@@ -48,11 +48,11 @@ def opt_parse()
 		$stderr.puts parser.help
 		exit 1
 	end
-	if FileTest.directory?($config_out_dir)
-		$stderr.puts "Error:output directory #{$config_out_dir} is already exist."
-		$stderr.puts parser.help
-		exit 1
-	end
+#	if FileTest.directory?($config_out_dir)
+#		$stderr.puts "Error:output directory #{$config_out_dir} is already exist."
+#		$stderr.puts parser.help
+#		exit 1
+#	end
 end
 opt_parse
 rs=Remotebackup::Restore.new($config_file,$config_out_dir)

data/lib/remotebackup.rb

@@ -10,7 +10,7 @@ require "date"
 require 'logger'
 require 'yaml'
 module Remotebackup
-  VERSION='0.50.8'
+  VERSION='0.50.9'
   class Node
     attr_accessor :ftype,:name,:makeMap
     LS_FILE = /([-a-z]*)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\d*)\s+([A-Z][a-z]*)\s+(\d+)\s+([\d:]*)\s+(.*)/
@@ -208,9 +208,14 @@ module Remotebackup
           if !oldFileMap[key] || oldFileMap[key]["date"] != val["date"] 
             @mod = true
             file_name = output_dir + "/" + key + date_to_filename
-            orig = "#{@path}/#{key}".gsub(/ /,"\\ ")
+            orig = "#{@path}/#{key}".gsub(/ /,"\\ ").gsub(/\(/,"\\(").gsub(/\)/,"\\)").gsub(/&/,"\\\\&").gsub(/\=/,"\\=")
             msg_out "scp #{orig} #{file_name}"
-            ssh.scp.download!(orig,file_name)
+            begin
+              ssh.scp.download!(orig,file_name)
+            rescue
+              $log.error("#{orig} can't copy. ignore.")
+              next
+            end
             val["file_name"] = file_name
             if !oldFileMap[key]
               msg_out "create file:#{key}"
@@ -297,6 +302,10 @@ module Remotebackup
         FileUtils.symlink(val["source"],@config_out_dir + "/" + key)
       end
       @file_info_map["file"].each do |key,val|
+        unless val['file_name']
+          $log.error("#{key} can't copy. ignore.")
+          next
+        end
         msg_out "cp #{val['file_name']} #{@config_out_dir}/#{key}"
         FileUtils.cp(val["file_name"],@config_out_dir + "/" + key)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remotebackup
 version: !ruby/object:Gem::Version 
-  version: 0.50.8
+  version: 0.50.9
 platform: ruby
 authors: 
 - takeshi morita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-22 00:00:00 +09:00
+date: 2008-11-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: remotebackup
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: remote ssh backup is backup files on remote server with ssh