From: velandy <rajesh.velandy@riftio.com>
Date: Thu, 6 Apr 2017 21:52:15 +0000 (+0200)
Subject: Merge "Bug 117"
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5a660df2c93308dc82a1bd31b8eb000558910ee9;hp=f86250edb1140b551886b6a184ad9963696bf72f;p=osm%2FSO.git

Merge "Bug 117"
---

diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
index a3b18402..dc31b68c 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
@@ -352,9 +352,14 @@ class DescriptorPackage(object):
 
         try:
             # Copy the contents of the file to the correct path
+            # For folder creation (or nested folders), dest_file appears w/ trailing "/" like: dir1/ or dir1/dir2/
+            # For regular file upload, dest_file appears as dir1/abc.txt
             dest_dir_path = os.path.dirname(dest_file)
             if not os.path.isdir(dest_dir_path):
                 os.makedirs(dest_dir_path)
+                if not os.path.basename(dest_file): 
+                    self._log.debug("Created dir path, no filename to insert in {}, skipping..".format(dest_dir_path))
+                    return
 
             with open(dest_file, 'wb') as dst_hdl:
                 with open(new_file, 'rb') as src_hdl: