cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Nitin Mehta" <nitin.me...@citrix.com>
Subject Re: Review Request: Fixed CLOUDSTACK-3004 [script] ssvm_check remove the duplicate file from consoleproxy and include the script from secondary storage folder while packing iso
Date Fri, 14 Jun 2013 14:53:53 GMT


> On June 14, 2013, 2:44 p.m., Nitin Mehta wrote:
> > Ship It!

Hi Rajesh - I get the error below while trying to apply your fix. Could you please correct
and resubmit ?
 
Nitins-MacBook-Air:cloudstack nitinmehta$ git apply --whitespace=fix ../0001-CLOUDSTACK-3004-\[script\]-ssvm_check-remove-the-duplicate-file-from-consoleproxy-and-include-the-script-from-secondary-storage-folder-while-packing-iso.patch

error: patch failed: services/console-proxy/server/scripts/ssvm-check.sh:1
error: services/console-proxy/server/scripts/ssvm-check.sh: patch does not apply


- Nitin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/11874/#review21905
-----------------------------------------------------------


On June 14, 2013, 10:09 a.m., Rajesh Battala wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/11874/
> -----------------------------------------------------------
> 
> (Updated June 14, 2013, 10:09 a.m.)
> 
> 
> Review request for cloudstack and Chip Childers.
> 
> 
> Description
> -------
> 
> Issue: .There are two ssvm_check scripts(duplicates).
> 
> ./services/console-proxy/server/scripts/ssvm-check.sh
> ./services/secondary-storage/scripts/ssvm-check.sh
> 
> When building the code, these scripts will go to systemvm.zip, systemvm.zip will be packaged
into systemvm.iso. 
> 
> systemvm-descriptor.xml will define what all the scripts should package.
> As per the descriptor xml,  the ssvm-check script under console-proxy is getting into
systemvm.zip.
> 
> I had verified the ssvm-check script with the fix under console-proxy. The systemvm.zip
is getting update properly and making into systemvm.iso.
> And ssvm is getting the right script now.
> 
> Changes made in script under ./services/secondary-storage/scripts/ssvm-check.sh is not
getting into systemvm.iso
> 
> Fixed:
>     Modified systemvm-descriptor.xml to pick the ssvm-check.sh form ./services/secondary-storage/scripts/ssvm-check.sh
>     removed the duplicate file which is creating confusion (./services/console-proxy/server/scripts/ssvm-check.sh)
> 
> 
> This addresses bug CLOUDSTACK-3004.
> 
> 
> Diffs
> -----
> 
>   services/console-proxy/server/scripts/ssvm-check.sh 7b83c98 
>   services/console-proxy/server/systemvm-descriptor.xml e34026b 
> 
> Diff: https://reviews.apache.org/r/11874/diff/
> 
> 
> Testing
> -------
> 
> Tested by generating the systemvm.zip , the ssvm-check file is getting copied into the
zip from the ./services/secondary-storage/scripts/ssvm-check.sh
> 
> 
> Thanks,
> 
> Rajesh Battala
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message