diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-11-26 00:52:21 +0000 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-11-26 00:52:21 +0000 |
| commit | 83acbcd80931dc6515440d9b2880d02583011b9c (patch) | |
| tree | ab2bdbc2385160e763ebdfd81501b0aa137a8d3d /lib/sisu/v0/sysenv.rb | |
| parent | Merge branch 'upstream' into debian/sid (diff) | |
| parent | various small adjustments for 0.62.3 (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sysenv.rb')
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index b2215b64..930068f1 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -2339,7 +2339,7 @@ p @zap local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external" remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image/." - remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/." + remote_images_external="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/." local_src=@source_path_src local_pod=@source_path_pod remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/." @@ -2355,7 +2355,7 @@ p @zap System_call.new(local_gen,remote_gen,@opt.cmd).rsync('--delete-after') if FileTest.file?("#{local_src}/#{src_txt}") System_call.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync - if defined? @md.ec[:image] + if not @md.ec[:image].empty? images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/") System_call.new(images,remote_images,@opt.cmd).rsync images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/") |