From: sinhan Date: Wed, 5 Apr 2017 22:27:34 +0000 (+0000) Subject: [Bug 244] For nested directories, extract the basename to get the filename after... X-Git-Tag: v2.0.0~12 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=e91374cd542f0a498507384881357e169db36675;p=osm%2FSO.git [Bug 244] For nested directories, extract the basename to get the filename after the nested directory path is created. Signed-off-by: sinhan Change-Id: I3cb134403d6dff954ce0ff1517f286a7310edd56 --- 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: