cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/master to 58bad41
Date Mon, 21 Jul 2014 11:52:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 9dc322d46 -> 58bad4191


Fixed CLOUDSTACK-6983: unable to register lxc template

added a check for tar.gz format in checktemplate


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58bad419
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58bad419
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58bad419

Branch: refs/heads/master
Commit: 58bad41910970fb3b08aa4d21875af6d04c8bf2e
Parents: 9dc322d
Author: Rajani Karuturi <rajanikaruturi@gmail.com>
Authored: Thu Jul 17 11:44:26 2014 +0530
Committer: Kishan Kavala <kishan@apache.org>
Committed: Mon Jul 21 16:57:53 2014 +0530

----------------------------------------------------------------------
 .../org/apache/cloudstack/utils/template/TemplateUtils.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58bad419/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
index a3f3a68..cf1e177 100644
--- a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
@@ -61,6 +61,13 @@ public class TemplateUtils {
             s_logger.debug("File at path " + path + " looks like ova : " + output);
             return "";
         }
+
+        //lxc
+        if (output.contains("POSIX tar") && isCorrectExtension(url, "tar")) {
+            s_logger.debug("File at path " + path + " looks like just tar : " + output);
+            return "";
+        }
+
         if (output.contains("ISO 9660") && isCorrectExtension(url, "iso")) {
             s_logger.debug("File at path " + path + " looks like an iso : " + output);
             return "";


Mime
View raw message