From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 23 Oct 2019 16:19:26 +0000 (+0200)
Subject: tools/validate_descriptor.py reconverted as python3 script
X-Git-Tag: v7.0.0rc1~39
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F86%2F8086%2F4;p=osm%2Fdevops.git

tools/validate_descriptor.py reconverted as python3 script

Change-Id: I6827fc17f79a99668205d74ae297fcfb41c1bb00
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index f54cd2c9..1b9a9e03 100755
--- a/descriptor-packages/tools/generate_descriptor_pkg.sh
+++ b/descriptor-packages/tools/generate_descriptor_pkg.sh
@@ -797,7 +797,7 @@ if [ $CREATE == false ]; then
     cd $BASE_DIR
     # Mrityunjay Yadav: Validate descriptor
     GEN_BASEDIR=$(dirname "$0")
-    python $GEN_BASEDIR/validate_descriptor.py $BASE_DIR/$PKG/$descriptor
+    python3 $GEN_BASEDIR/validate_descriptor.py $BASE_DIR/$PKG/$descriptor
     if [ $? -ne 0 ]; then
         rc=$?
         echo "ERROR: validating descriptor for $PKG ($rc)" >&2
diff --git a/descriptor-packages/tools/validate_descriptor.py b/descriptor-packages/tools/validate_descriptor.py
index 3c6dd419..92b61c99 100755
--- a/descriptor-packages/tools/validate_descriptor.py
+++ b/descriptor-packages/tools/validate_descriptor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 ##
@@ -110,7 +110,7 @@ if __name__ == "__main__":
 
         for o, a in opts:
             if o in ("-v", "--version"):
-                print ("test descriptor version THREE " + __version__ + ' ' + version_date)
+                print("test descriptor version THREE " + __version__ + ' ' + version_date)
                 sys.exit()
             elif o in ("-h", "--help"):
                 usage()