← Back to branch summary

~smartboyhw/wubi/bug-1080090-new

« back to all changes in this revision

Viewing changes to src/wubi/backends/common/distro.py

  • Committer: Howard Chan
  • Date: 2012-11-20 10:04:16 UTC
  • Revision ID: smartboyhw@gmail.com-20121120100416-yor3hhzeb10r877n
https://launchpad.net/bugs/1080090
Changed image files so that Ubuntu Studio is installable. Also added
back the original code in distro.py (LP: #1080090)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wubi/backends/common/distro.py
188
188
        if not info:
189
189
            return
190
190
        info = disk_info_re.match(info)
191
 
        # Should be:
192
 
        #  name = info.group('name').replace('-', ' ')
193
 
        # Unfortunately, flavour names containing spaces seem to cause
194
 
        # problems elsewhere at the moment.  The .replace should be restored
195
 
        # as soon as this is fixed, because "Ubuntu Studio" is a more
196
 
        # correct description than "Ubuntu-Studio".  See LP
197
 
        # #1070682/#1080090.
198
 
        name = info.group('name')
 
191
        # For rev. 278 the .replace('-', ' ') is resumed.
 
192
        name = info.group('name').replace('-', ' ')
199
193
        version = info.group('version')
200
194
        subversion = info.group('subversion')
201
195
        arch = info.group('arch')