Commit 0e6b7894 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Fix downloading without any suffix.

When no suffix is specified, for those that we had a "custom suffix" we
ended up with "NIGHTLY" tags added. This fixes that issue. Now I can use this
file on public.kitware.com to download releases from the dashboard.

Change-Id: I56068a30917c38f686e25f24a07b13c4e8c04d43
parent b59fee77
......@@ -20,11 +20,11 @@ keepVersion = False
# ----------------------------------------------------------------------------------------
customSuffix = {
'altair.kitware': {
'MountainLion-nightlymaster-superbuild' : '10.8-NIGHTLY',
'MountainLion-nightlymaster-superbuild-nompi' : '10.8-NoMPI-NIGHTLY' },
'debian-x64.kitware': {'nightlymaster-superbuild' : 'glibc-2.3.6-NIGHTLY' },
'debian-x32.kitware': {'nightlymaster-superbuild' : 'glibc-2.3.6-NIGHTLY' },
'Blight.kitware' : {'ubuntu-x64-nightlymaster-superbuild' : 'glibc-2.15-NIGHTLY' }
'MountainLion-nightlymaster-superbuild' : '10.8',
'MountainLion-nightlymaster-superbuild-nompi' : '10.8-NoMPI' },
'debian-x64.kitware': {'nightlymaster-superbuild' : 'glibc-2.3.6' },
'debian-x32.kitware': {'nightlymaster-superbuild' : 'glibc-2.3.6' },
'Blight.kitware' : {'ubuntu-x64-nightlymaster-superbuild' : 'glibc-2.15' }
}
# ----------------------------------------------------------------------------------------
......@@ -133,9 +133,13 @@ def getBuildInfo(buildId):
# ----------------------------------------------------------------------------------------
def getSuffix(buildInfo, default_suffix):
if customSuffix.has_key(info['site']) and customSuffix[info['site']].has_key(info['name']):
return customSuffix[info['site']][info['name']]
return default_suffix
if customSuffix.has_key(info['site']) and customSuffix[info['site']].has_key(info['name']):
custom_suffix = customSuffix[info['site']][info['name']]
if default_suffix:
return "%s-%s" % (custom_suffix, default_suffix)
else:
return custom_suffix
return default_suffix
# ----------------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment