Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try path.os.basename/split instead of string.rsplit

Browse Source
This commit is contained in:
Shyotl
2014-12-09 01:28:23 -06:00
parent b680b53128
commit f014c8207c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/develop.py
View File

@@ -111,7 +111,7 @@ class PlatformSetup(object):
def build_dirs(self): def build_dirs(self):
'''Return the top-level directories in which builds occur. '''Return the top-level directories in which builds occur.
if(os.getcwd().rsplit('/', 1)[1] == 'indra'): if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'):
prefix = '../' prefix = '../'
else: else:
prefix = '' prefix = ''
@@ -279,7 +279,7 @@ class LinuxSetup(UnixSetup):
return 'linux' return 'linux'
def build_dirs(self): def build_dirs(self):
if(os.getcwd().rsplit('/', 1)[1] == 'indra'): if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'):
prefix = '../' prefix = '../'
else: else:
prefix = '' prefix = ''
@@ -510,7 +510,7 @@ class WindowsSetup(PlatformSetup):
return 'win32' return 'win32'
def build_dirs(self): def build_dirs(self):
if(os.getcwd().rsplit('\\', 1)[1] == 'indra'): if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'):
prefix = '../' prefix = '../'
else: else:
prefix = '' prefix = ''
@@ -671,7 +671,12 @@ class WindowsSetup(PlatformSetup):
if prev_build == self.build_type: if prev_build == self.build_type:
# Only run vstool if the build type has changed. # Only run vstool if the build type has changed.
continue continue
vstool_cmd = (os.path.join('indra','tools','vstool','VSTool.exe') +
if(os.path.basename(os.path.normpath(os.getcwd())) == 'indra'):
tool_path = os.path.join('tools','vstool','VSTool.exe')
else:
tool_path = os.path.join('indra','tools','vstool','VSTool.exe')
vstool_cmd = (tool_path +
' --solution ' + ' --solution ' +
os.path.join(build_dir,'Singularity.sln') + os.path.join(build_dir,'Singularity.sln') +
' --config ' + self.build_type + ' --config ' + self.build_type +

12
scripts/install.py
View File

@@ -126,16 +126,20 @@ class InstallFile(object):
return True return True
def fetch_local(self): def fetch_local(self):
#print "Looking for:",self.filename cache_path, cache_file = os.path.split(self.filename)
cache_path, cache_folder = os.path.split(os.path.normpath(cache_path))
cache_file = os.path.join(cache_path, cache_folder.rsplit('.',1)[0] + ".<user>", cache_file)
#print "Looking for:",cache_file
if not os.path.exists(self.filename): if not os.path.exists(self.filename):
pass pass
elif self.md5sum and not self._is_md5sum_match(): elif self.md5sum and not self._is_md5sum_match():
print "md5 mismatch:", self.filename print "md5 mismatch:", cache_file
os.remove(self.filename) os.remove(self.filename)
else: else:
print "Found matching package:", self.filename print "Found matching package:", cache_file
return return
print "Downloading",self.url,"to local file",self.filename print "Downloading",self.url,"to local file",cache_file
request = urllib2.Request(self.url) request = urllib2.Request(self.url)