Merge branch 'v1.0'

diff --git a/BUILD.sh b/BUILD.sh
index 4521ca7..ec01675 100755 (executable)
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -171,6 +171,7 @@ fi
 if $runMkcontainer; then
     sudo apt-get install -y libxml2-dev libxslt-dev
     sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY}
+    sudo pip3 install -y lxml==3.4.0
 fi
 
 

diff --git a/common/python/rift/mano/yang_translator/shell.py b/common/python/rift/mano/yang_translator/shell.py
index f353e92..915cd6c 100644 (file)
--- a/common/python/rift/mano/yang_translator/shell.py
+++ b/common/python/rift/mano/yang_translator/shell.py
@@ -149,7 +149,9 @@ class TranslatorShell(object):
         if typ.startswith('text/plain'):
             # Assume to be yaml
             return self.YAML
-        elif typ.startswith('application/x-gzip'):
+        # On Fedora 20, it return x-gzip, while on Ubuntu 16 it is gzip
+        elif typ.startswith('application/x-gzip') or \
+             typ.startswith('application/gzip') :
             return self.TAR
         else:
             msg = _("The file {0} is not a supported type: {1}"). \