show more errors

Author: tach

bin/rbphoto-import

@@ -46,8 +46,7 @@ class RbPhoto
 
     def initialize
       @args = RbPhoto::Args.new
-      @fileopts = {:force => @args['force'],
-                   :verbose => @args['verbose'],
+      @fileopts = {:verbose => @args['verbose'],
                    :noop => @args['no_act']}
       @postfix = '-' + ENV['USER']
       if ( @args['version'] )
@@ -77,27 +76,43 @@ class RbPhoto
 
     def copy
       @target.each do |file|
-	if ( @args['without_rename'] )
-	  target_file = file
-	else
-	  target_file = self.rename(file)
-	end
-
-	target_dir = File.dirname(target_file)
-	if ( ! File.directory?(target_dir) )
-	  FileUtils.makedirs(target_dir, @fileopts)
-	end
-
-	begin
-	  if ( @args['move'] )
-	    FileUtils.mv(file, target_file, @fileopts)
-	  else
-	    FileUtils.cp(file, target_file, @fileopts)
-	  end
-	  FileUtils.chmod(0444, target_file, @fileopts)
-	rescue => e
-    STDERR.puts "ERROR: execution failed: #{e.to_s}"
-	end
+       	if ( @args['without_rename'] )
+      	  target_file = file
+      	else
+	        target_file = self.rename(file)
+       	end
+
+       	target_dir = File.dirname(target_file)
+       	if ( ! File.directory?(target_dir) )
+          begin
+            FileUtils.makedirs(target_dir, @fileopts)
+          rescue => e
+            STDERR.puts "ERROR: mkdir failed: #{e.to_s}"
+          end
+      	end
+
+     	  if ( @args['move'] )
+          begin
+	          FileUtils.mv(file, target_file, @fileopts)
+          rescue => e
+            if ( e.is_a?(Errno::EACCES) && @args['force'] && !File.writable?(target_file))
+              FileUtils.chmod(0644, target_file, @fileopts)
+              retry
+            end
+            STDERR.puts "ERROR: mv failed: #{e.to_s}"
+          end
+  	    else
+          begin
+	          FileUtils.cp(file, target_file, @fileopts)
+          rescue => e
+            STDERR.puts "ERROR: cp failed: #{e.to_s}"
+          end
+	      end
+        begin
+	        FileUtils.chmod(0444, target_file, @fileopts)
+	      rescue => e
+          STDERR.puts "ERROR: chmod failed: #{e.to_s}"
+	      end
       end
     end
 

debian/changelog

@@ -3,8 +3,9 @@ rbphoto (0.1.4) unstable; urgency=low
   * Use "fileutils" instead of "ftools"
     - Use fileutils feature to show verbose output
   * Add "--force" option to overwrite when the file exists
+  * Show more errors 
 
- -- Taku YASUI <[email protected]>  Thu, 19 Jun 2008 02:42:49 +0900
+ -- Taku YASUI <[email protected]>  Thu, 19 Jun 2008 04:25:08 +0900
 
 rbphoto (0.1.3) unstable; urgency=low