You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/04 12:34:32 UTC
[8/9] git commit: updated refs/heads/master to 93845af
Renaming the variable from "s" to "script"
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f4e2c7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f4e2c7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f4e2c7c
Branch: refs/heads/master
Commit: 7f4e2c7cf0a6d1688c783f6d3ae4a4b3fef254ec
Parents: 6138d9a
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Thu Jun 4 08:47:00 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu Jun 4 12:34:05 2015 +0200
----------------------------------------------------------------------
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f4e2c7c/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
index 802bc9d..7caab74 100644
--- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
+++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
@@ -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);
}