Permalink
Browse files

Bug 746115 - Don't use getPrettyVersion for partner-repacks. r=coop

  • Loading branch information...
1 parent aecc0f5 commit 151d59e8ae950a026652fe4945a521cde71a0d9c @rail rail committed Apr 17, 2012
Showing with 2 additions and 13 deletions.
  1. +2 −13 scripts/partner-repacks.py
View
15 scripts/partner-repacks.py
@@ -48,13 +48,6 @@ def http_error_default(self, url, fp, errcode, errmsg, headers):
headers)
-def getPrettyVersion(version):
- version = re.sub(r'a([0-9]+)$', r' Alpha \1', version)
- version = re.sub(r'b([0-9]+)$', r' Beta \1', version)
- version = re.sub(r'rc([0-9]+)$', r' RC \1', version)
- return version
-
-
# Source:
# http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
def which(program):
@@ -247,16 +240,12 @@ def getFilename(version, platform, file_ext):
'''Returns the properly formatted filename based on the version string.
File location/nomenclature changed starting with 3.5.
'''
-
- # Deal with alpha/beta releases.
- version_formatted = getPrettyVersion(version)
-
if isLinux(platform):
return "firefox-%s.%s" % (version, file_ext)
if isMac(platform):
- return "Firefox %s.%s" % (version_formatted, file_ext)
+ return "Firefox %s.%s" % (version, file_ext)
if isWin(platform):
- return "Firefox Setup %s.%s" % (version_formatted, file_ext)
+ return "Firefox Setup %s.%s" % (version, file_ext)
return None

0 comments on commit 151d59e

Please sign in to comment.