X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Fpackage_tool.py;h=3e68ab2d4bc83a9dd5b44ddfa5e42379cdad7541;hb=274a00be45a43e5f42feb98bb5cc704bfc407c12;hp=f35a7f33d63018dbcc5062c42df3048defa0fc31;hpb=76c880e2d5929a0298b31d5b0bf2431d897b2508;p=osm%2Fosmclient.git

diff --git a/osmclient/common/package_tool.py b/osmclient/common/package_tool.py
index f35a7f3..3e68ab2 100644
--- a/osmclient/common/package_tool.py
+++ b/osmclient/common/package_tool.py
@@ -276,10 +276,10 @@ class PackageTool(object):
         descriptor_file = False
         descriptors_paths = [f for f in glob.glob(package_folder + "/*.yaml")]
         for file in descriptors_paths:
-            if 'nfd.yaml' in file:
+            if file.endswith('nfd.yaml'):
                 descriptor_file = True
                 listCharms = self.charms_search(file, 'vnf')
-            if 'nsd.yaml' in file:
+            if file.endswith('nsd.yaml'):
                 descriptor_file = True
                 listCharms = self.charms_search(file, 'ns')
         print("List of charms in the descriptor: {}".format(listCharms))
@@ -290,7 +290,7 @@ class PackageTool(object):
                 if os.path.isdir('{}/charms/layers/{}'.format(package_folder,charmName)):
                     print('Building charm {}/charms/layers/{}'.format(package_folder, charmName))
                     self.charm_build(package_folder, charmName)
-                    print('Charm built'.format(charmName))
+                    print('Charm built: {}'.format(charmName))
                 else:
                     if not os.path.isdir('{}/charms/{}'.format(package_folder,charmName)):
                         raise ClientException ('The charm: {} referenced in the descriptor file '
@@ -392,7 +392,7 @@ class PackageTool(object):
         ignore_patterns = ('.gitignore')
         ignore = shutil.ignore_patterns(ignore_patterns)
         directory_name = os.path.abspath("{}/tmp".format(package_folder))
-        os.makedirs("{}/{}".format(directory_name, os.path.basename(package_folder),exist_ok=True))
+        os.makedirs("{}/{}".format(directory_name, os.path.basename(package_folder)),exist_ok=True)
         self._logger.debug("Makedirs DONE: {}/{}".format(directory_name, os.path.basename(package_folder)))
         for item in os.listdir(package_folder):
             self._logger.debug("Item: {}".format(item))