[hg] galaxy 3518: fix for string.translate on empty path in crea...
details: http://www.bx.psu.edu/hg/galaxy/rev/e98117dd6054 changeset: 3518:e98117dd6054 user: fubar: ross Lazarus at gmail period com date: Thu Mar 11 13:37:49 2010 -0500 description: fix for string.translate on empty path in creating an archive of library composite datatypes diffstat: lib/galaxy/web/controllers/library_common.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 2e97ae04856d -r e98117dd6054 lib/galaxy/web/controllers/library_common.py --- a/lib/galaxy/web/controllers/library_common.py Thu Mar 11 11:17:11 2010 -0500 +++ b/lib/galaxy/web/controllers/library_common.py Thu Mar 11 13:37:49 2010 -0500 @@ -1357,7 +1357,8 @@ path = os.path.join( parent_folder.name, path ) parent_folder = parent_folder.parent path += ldda.name - path = path.translate(trantab) + if path > '': + path = path.translate(trantab) while path in seen: path += '_' seen.append( path ) @@ -1377,7 +1378,8 @@ flist = glob.glob(os.path.join(ldda.dataset.extra_files_path,'*.*')) # glob returns full paths for fpath in flist: efp,fname = os.path.split(fpath) - fname = fname.translate(trantab) + if fname > '': + fname = fname.translate(trantab) try: archive.add( fpath,fname ) except IOError:
participants (1)
-
Greg Von Kuster