etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renaming the variable from "s" to "script" 

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This commit is contained in:
wilderrodrigues 2015-06-04 08:47:00 +02:00 committed by Daan Hoogland
parent 6138d9a690
commit 7f4e2c7cf0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
View File

@ -224,29 +224,29 @@ public class QemuImg {
* @return void
*/
public void convert(final QemuImgFile srcFile, final QemuImgFile destFile, final Map<String, String> options) throws QemuImgException {
final Script s = new Script(_qemuImgPath, timeout);
s.add("convert");
final Script script = new Script(_qemuImgPath, timeout);
script.add("convert");
// autodetect source format. Sometime int he future we may teach KVMPhysicalDisk about more formats, then we can explicitly pass them if necessary
//s.add("-f");
//s.add(srcFile.getFormat().toString());
s.add("-O");
s.add(destFile.getFormat().toString());
script.add("-O");
script.add(destFile.getFormat().toString());
if (options != null && !options.isEmpty()) {
s.add("-o");
script.add("-o");
final StringBuffer optionsBuffer = new StringBuffer();
for (final Map.Entry<String, String> option : options.entrySet()) {
optionsBuffer.append(option.getKey()).append('=').append(option.getValue()).append(',');
}
String optionsStr = optionsBuffer.toString();
optionsStr = optionsStr.replaceAll(",$", "");
s.add(optionsStr);
script.add(optionsStr);
}
s.add(srcFile.getFileName());
s.add(destFile.getFileName());
script.add(srcFile.getFileName());
script.add(destFile.getFileName());
final String result = s.execute();
final String result = script.execute();
if (result != null) {
throw new QemuImgException(result);
}