From b1afa42243ffbaf96232296c342d1d11de55e79f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 17 Dec 2007 03:43:48 +0000
Subject: rsync sisupod, bugfix

---
 lib/sisu/v0/sysenv.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index e571838b..a78bec85 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -2154,6 +2154,11 @@ WOK
         "#{@env.path.output}/src"
       else @env.path.output_src
       end
+      @source_path_pod=if @fnb \
+      and not @fnb.empty?
+        "#{@env.path.output}/pod"
+      else @env.path.output_pod
+      end
       @local_sisu_source=if @filetypes =~/\S/; "#@source_path/#@filetypes"
       else                  @source_path
       end
@@ -2318,7 +2323,8 @@ p @zap
           System_call.new(local_gen,remote_gen).scp
           if FileTest.file?("#{local_src}/#{src_txt}")
             System_call.new("#{local_src}/#{src_txt}",remote_src).scp
-          elsif FileTest.file?("#{local_pod}/#{src_pod}")
+          end
+          if FileTest.file?("#{local_pod}/#{src_pod}")
             System_call.new("#{local_src}/#{src_pod}",remote_pod).scp
           end
         elsif  @opt.cmd =~/U/
@@ -2326,7 +2332,8 @@ p @zap
           puts "#{local_gen} -> #{remote_gen}"
           if FileTest.file?("#{local_src}/#{src_doc}")
             puts "#{local_src}/#{src_doc}* -> #{remote_src}"
-          elsif FileTest.file?("#{local_pod}/#{src_doc}.zip")
+          end
+          if FileTest.file?("#{local_pod}/#{src_doc}.zip")
             puts "#{local_pod}/#{src_doc}* -> #{remote_pod}"
           end
         else
@@ -2365,8 +2372,9 @@ p @zap
               images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/")
               System_call.new(images_external,remote_images_external,@opt.cmd).rsync
             end
-          elsif FileTest.file?("#{local_pod}/#{src_pod}")
-            System_call.new("#{local_pod}/#{src_pod}",remote_src,@opt.cmd).rsync
+          end
+          if FileTest.file?("#{local_pod}/#{src_pod}")
+            System_call.new("#{local_pod}/#{src_pod}",remote_pod,@opt.cmd).rsync
           end
         elsif  @opt.cmd =~/U/
           puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
-- 
cgit v1.2.3