← Back to branch summary

~heber013/ubuntu-server-iso-testing/fixing-default-distro-error

« back to all changes in this revision

Viewing changes to download-latest-test-iso.py

  • Committer: Jean-Baptiste Lallement
  • Date: 2013-11-05 15:44:10 UTC
  • Revision ID: jean-baptiste.lallement@ubuntu.com-20131105154410-cdbgo770sk0yicjp
set default release to trusty
fix download url for flavors

Show diffs side-by-side

added added

removed removed

Lines of Context:
download-latest-test-iso.py
34
34
    import distro_info
35
35
    DEFAULT_RELEASE = distro_info.UbuntuDistroInfo().devel()
36
36
except ImportError:
37
 
    DEFAULT_RELEASE = 'raring'
 
37
    DEFAULT_RELEASE = 'trusty'
38
38
 
39
39
DEFAULT_ARCH = 'all'
40
40
DEFAULT_FLAVOR = 'ubuntu-server'
146
146
 
147
147
    # Setup URLS
148
148
    release_part = options.release
 
149
    flavor_part = options.flavor
149
150
    if options.release == DEFAULT_RELEASE:
150
151
        release_part = ''
 
152
    if options.flavor == 'ubuntu':
 
153
        flavor_part = ''
151
154
    if options.variant == 'desktop':
152
 
        l_url = os.path.join(options.base_url, release_part, 'daily-live')
 
155
        l_url = os.path.join(options.base_url, release_part, flavor_part, 'daily-live')
153
156
    elif options.variant == 'alternate':
154
 
        l_url = os.path.join(options.base_url, release_part, 'daily')
 
157
        l_url = os.path.join(options.base_url, release_part, flavor_part, 'daily')
155
158
    else:
156
159
        # Default to server
157
160
        l_url = os.path.join(options.base_url, 'ubuntu-server', release_part,