From: sinhan <nandan.sinha@riftio.com>
Date: Mon, 1 May 2017 20:46:48 +0000 (+0000)
Subject: RIFT 16087 Strip off any leading slashes from README asset files so that it downloads.
X-Git-Tag: v2.0.1~20
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1f7abdc0e536ee70c1561306b796afab6959caf0;p=osm%2FSO.git

RIFT 16087 Strip off any leading slashes from README asset files so that it downloads.

Signed-off-by: sinhan <nandan.sinha@riftio.com>
---

diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
index 6cfc0faf..2acfed1b 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
@@ -83,9 +83,10 @@ class FileSystemProxy(AbstractPackageManagerProxy):
         # the first part will always be the vnfd/nsd name
         mode = 0o664
 
-        # for files other than README, create the package path from the asset type
+        # for files other than README, create the package path from the asset type, e.g. icons/icon1.png
+        # for README files, strip off any leading '/' 
         package_path = package_file_type + "/" + package_path \
-            if package_file_type != "readme" else package_path
+            if package_file_type != "readme" else package_path.strip('/')
         components = package_path.split("/")
         if len(components) > 2:
             schema = components[1]
@@ -106,6 +107,7 @@ class FileSystemProxy(AbstractPackageManagerProxy):
             self.log.exception(e)
             return False
 
+        self.log.debug("File insertion complete at {}".format(dest_file))
         return True
 
     def package_file_delete(self, package_type, package_id, package_path, package_file_type):