Merged revisions 77737 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77737 | benjamin.peterson | 2010-01-24 21:37:42 -0600 (Sun, 24 Jan 2010) | 9 lines

  Merged revisions 77735 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77735 | benjamin.peterson | 2010-01-24 21:31:13 -0600 (Sun, 24 Jan 2010) | 1 line

    fix an UnboundLocalError when the release file is empty #7773
  ........
................
This commit is contained in:
Benjamin Peterson 2010-01-25 03:40:53 +00:00
parent fcdf9f215e
commit 79e0b818c5
4 changed files with 11 additions and 2 deletions

View file

@ -245,6 +245,12 @@ _supported_dists = (
def _parse_release_file(firstline):
# Default to empty 'version' and 'id' strings. Both defaults are used
# when 'firstline' is empty. 'id' defaults to empty when an id can not
# be deduced.
version = ''
id = ''
# Parse the first line
m = _lsb_release_version.match(firstline)
if m is not None:
@ -262,8 +268,6 @@ def _parse_release_file(firstline):
version = l[0]
if len(l) > 1:
id = l[1]
else:
id = ''
return '', version, id
def linux_distribution(distname='', version='', id='',