← Back to branch summary

~bcbc/wubi/lp1134770-1155704

« back to all changes in this revision

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

  • Committer: Colin Watson
  • Date: 2012-11-19 09:34:25 UTC
  • mfrom: (275.1.1 wubi)
  • Revision ID: cjwatson@canonical.com-20121119093425-56skklif2l1xpit6
merge lp:~smartboyhw/wubi/bug-1080090 (with adjustments)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wubi/backends/common/distro.py
182
182
        Ubuntu 9.04 "Jaunty Jackalope" - Alpha i386 (20090106)
183
183
        Ubuntu 9.04 "Jaunty Jackalope" - Alpha i386 (20090106.1)
184
184
        Ubuntu Split Name 9.04.1 "Jaunty Jackalope" - Final Release i386 (20090106.2)
 
185
        Ubuntu-Studio 12.10 "Quantal Quetzal" - Release amd64 (20121017.1)
185
186
        '''
186
187
        log.debug("  parsing info from str=%s" % info)
187
188
        if not info:
188
189
            return
189
190
        info = disk_info_re.match(info)
190
 
        name = info.group('name').replace('-', ' ')
 
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 #1070682.
 
197
        name = info.group('name')
191
198
        version = info.group('version')
192
199
        subversion = info.group('subversion')
193
200
        arch = info.group('arch')