[cloudstack] branch master updated: Fix template registration error (#4008)

[andrijapanic]

This is an automated email from the ASF dual-hosted git repository.

andrijapanic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 22b4cca  Fix template registration error (#4008)
22b4cca is described below

commit 22b4cca50def31e2f2a7487f92308a46747da966
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Fri Apr 3 15:37:00 2020 -0300

    Fix template registration error (#4008)
---
 .../java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
 
b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
index 5e0811d..da19419 100644
--- 
a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
+++ 
b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
@@ -58,7 +58,7 @@ public class ImageStoreUtil {
             return "";
         }
         // raw
-        if ((output.contains("x86 boot") || output.contains("DOS/MBR boot 
sector") || output.contains("data")) && (isCorrectExtension(uripath, "raw") || 
isCorrectExtension(uripath, "img"))) {
+        if ((output.contains("x86 boot") || output.contains("DOS/MBR boot 
sector") || output.contains("data")) && isCorrectExtension(uripath, "raw")) {
             s_logger.debug("File at path " + path + " looks like a raw image 
:" + output);
             return "";
         }